34c4e47c9b
- Allow NamedLoaderContexts to be returned from loader - Revert the change making reactor less blocking (bsc#1230322) - Use --cachedir for extension_modules in salt-call (bsc#1226141) - Prevent using SyncWrapper with no reason - Added: * avoid-explicit-reading-of-etc-salt-minion-bsc-122035.patch * allow-namedloadercontexts-to-be-returned-from-loader.patch * revert-the-change-making-reactor-less-blocking-bsc-1.patch * use-cachedir-for-extension_modules-in-salt-call-bsc-.patch * prevent-using-syncwrapper-with-no-reason.patch OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=259
28 lines
697 B
Diff
28 lines
697 B
Diff
From 578932e56be4b4151aa33bd25997c916b0e00a04 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
<psuarezhernandez@suse.com>
|
|
Date: Wed, 4 Jan 2023 13:11:50 +0000
|
|
Subject: [PATCH] Use RLock to avoid deadlocks in salt-ssh
|
|
|
|
---
|
|
salt/loader/__init__.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/loader/__init__.py b/salt/loader/__init__.py
|
|
index bbe4269839..b41cc64b8e 100644
|
|
--- a/salt/loader/__init__.py
|
|
+++ b/salt/loader/__init__.py
|
|
@@ -82,7 +82,7 @@ SALT_INTERNAL_LOADERS_PATHS = (
|
|
str(SALT_BASE_PATH / "wheel"),
|
|
)
|
|
|
|
-LOAD_LOCK = threading.Lock()
|
|
+LOAD_LOCK = threading.RLock()
|
|
|
|
|
|
def LazyLoader(*args, **kwargs):
|
|
--
|
|
2.39.2
|
|
|
|
|