31 lines
965 B
Diff
31 lines
965 B
Diff
|
From 83fbfcbf49c98624029f1d215b7ad4d247128d39 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Ond=C5=99ej=20Hole=C4=8Dek?= <oholecek@aaannz.eu>
|
||
|
|
Date: Mon, 10 May 2021 16:23:19 +0200
|
||
|
|
Subject: [PATCH] Fix missing minion returns in batch mode (#360)
|
||
|
|
|
||
|
|
Don't close pub if there are pending events, otherwise events will be lost
|
||
|
|
resulting in empty minion returns.
|
||
|
|
|
||
|
|
Co-authored-by: Denis V. Meltsaykin <dmeltsaykin@mirantis.com>
|
||
|
|
---
|
||
|
|
salt/client/__init__.py | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/salt/client/__init__.py b/salt/client/__init__.py
|
||
|
|
index ddb437604b..78f4d99e84 100644
|
||
|
|
--- a/salt/client/__init__.py
|
||
|
|
+++ b/salt/client/__init__.py
|
||
|
|
@@ -920,7 +920,7 @@ class LocalClient:
|
||
|
|
|
||
|
|
self._clean_up_subscriptions(pub_data["jid"])
|
||
|
|
finally:
|
||
|
|
- if not was_listening:
|
||
|
|
+ if not was_listening and not self.event.pending_events:
|
||
|
|
self.event.close_pub()
|
||
|
|
|
||
|
|
def cmd_full_return(
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|
||
|
|
|