Do not alow get_event to run with async subscriber

saltstack · Jan 20, 2025 · 07d1715 · 07d1715
1 parent 4386d7b
commit 07d1715
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/salt/utils/asynchronous.py b/salt/utils/asynchronous.py
@@ -63,7 +63,8 @@ def __init__(
         self.cls = cls
         if loop_kwarg:
             kwargs[self.loop_kwarg] = self.io_loop
-        self.obj = cls(*args, **kwargs)
+        with current_ioloop(self.io_loop):
+            self.obj = cls(*args, **kwargs)
         self._async_methods = list(
             set(async_methods + getattr(self.obj, "async_methods", []))
         )

diff --git a/salt/utils/event.py b/salt/utils/event.py
@@ -75,6 +75,7 @@
 import salt.utils.process
 import salt.utils.stringutils
 import salt.utils.zeromq
+from salt.exceptions import SaltInvocationError
 
 log = logging.getLogger(__name__)
 
@@ -567,6 +568,9 @@ def _get_event(self, wait, tag, match_func=None, no_block=False):
             try:
                 if not self.cpub and not self.connect_pub(timeout=wait):
                     break
+                if not self._run_io_loop_sync:
+                    log.error("Trying to get event with async subscriber")
+                    raise SaltInvocationError("get_event needs synchornous subscriber")
                 raw = self.subscriber.read(timeout=wait)
                 if raw is None:
                     break