File add-batch_presence_ping_timeout-and-batch_prese... of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File add-batch_presence_ping_timeout-and-batch_presence_p.patch of Package salt (Revision 4a2fcf44fe1e10da9b6dce5d8fcc89eb)

Currently displaying revision 4a2fcf44fe1e10da9b6dce5d8fcc89eb , Show latest

From 669a03b26870a7109c3f4b327dd2b5a4ec4fa1ba Mon Sep 17 00:00:00 2001
From: Marcelo Chiaradia <mchiaradia@suse.com>
Date: Thu, 4 Apr 2019 13:57:38 +0200
Subject: [PATCH] Add 'batch_presence_ping_timeout' and
 'batch_presence_ping_gather_job_timeout' parameters for synchronous batching

---
 salt/cli/batch.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/salt/cli/batch.py b/salt/cli/batch.py
index 36e66da1af..67f03c8a45 100644
--- a/salt/cli/batch.py
+++ b/salt/cli/batch.py
@@ -83,6 +83,9 @@ def batch_get_opts(
         if key not in opts:
             opts[key] = val
 
+    opts['batch_presence_ping_timeout'] = kwargs.get('batch_presence_ping_timeout', opts['timeout'])
+    opts['batch_presence_ping_gather_job_timeout'] = kwargs.get('batch_presence_ping_gather_job_timeout', opts['gather_job_timeout'])
+
     return opts
 
 
@@ -119,7 +122,7 @@ class Batch(object):
         args = [self.opts['tgt'],
                 'test.ping',
                 [],
-                self.opts['timeout'],
+                self.opts.get('batch_presence_ping_timeout', self.opts['timeout']),
                 ]
 
         selected_target_option = self.opts.get('selected_target_option', None)
@@ -130,7 +133,7 @@ class Batch(object):
 
         self.pub_kwargs['yield_pub_data'] = True
         ping_gen = self.local.cmd_iter(*args,
-                                       gather_job_timeout=self.opts['gather_job_timeout'],
+                                       gather_job_timeout=self.opts.get('batch_presence_ping_gather_job_timeout', self.opts['gather_job_timeout']),
                                        **self.pub_kwargs)
 
         # Broadcast to targets
-- 
2.16.4

Places

File add-batch_presence_ping_timeout-and-batch_presence_p.patch of Package salt (Revision 4a2fcf44fe1e10da9b6dce5d8fcc89eb)

Places