Merge pull request #40072 from meaksh/2016.11-handling-timeouts-for-manage.up-runner

[2016.11] Allows overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call

salt/client/__init__.py

@@ -231,7 +231,7 @@ class LocalClient(object):
         Return the information about a given job
         '''
         log.debug('Checking whether jid {0} is still running'.format(jid))
-        timeout = self.opts['gather_job_timeout']
+        timeout = kwargs.get('gather_job_timeout', self.opts['gather_job_timeout'])
 
         pub_data = self.run_job(tgt,
                                 'saltutil.find_job',
@@ -989,6 +989,7 @@ class LocalClient(object):
 
         if timeout is None:
             timeout = self.opts['timeout']
+        gather_job_timeout = kwargs.get('gather_job_timeout', self.opts['gather_job_timeout'])
         start = int(time.time())
 
         # timeouts per minion, id_ -> timeout time
@@ -1089,7 +1090,7 @@ class LocalClient(object):
                     jinfo_iter = []
                 else:
                     jinfo_iter = self.get_returns_no_block('salt/job/{0}'.format(jinfo['jid']))
-                timeout_at = time.time() + self.opts['gather_job_timeout']
+                timeout_at = time.time() + gather_job_timeout
                 # if you are a syndic, wait a little longer
                 if self.opts['order_masters']:
                     timeout_at += self.opts.get('syndic_wait', 1)

salt/runners/manage.py

@@ -34,7 +34,7 @@ FINGERPRINT_REGEX = re.compile(r'^([a-f0-9]{2}:){15}([a-f0-9]{2})$')
 log = logging.getLogger(__name__)
 
 
-def _ping(tgt, expr_form, timeout):
+def _ping(tgt, expr_form, timeout, gather_job_timeout):
     client = salt.client.get_local_client(__opts__['conf_file'])
     pub_data = client.run_job(tgt, 'test.ping', (), expr_form, '', timeout, '')
 
@@ -47,7 +47,8 @@ def _ping(tgt, expr_form, timeout):
             pub_data['minions'],
             client._get_timeout(timeout),
             tgt,
-            expr_form):
+            expr_form,
+            gather_job_timeout=gather_job_timeout):
 
         if fn_ret:
             for mid, _ in six.iteritems(fn_ret):
@@ -58,7 +59,7 @@ def _ping(tgt, expr_form, timeout):
     return list(returned), list(not_returned)
 
 
-def status(output=True, tgt='*', expr_form='glob'):
+def status(output=True, tgt='*', expr_form='glob', timeout=None, gather_job_timeout=None):
     '''
     Print the status of all known salt minions
 
@@ -67,10 +68,17 @@ def status(output=True, tgt='*', expr_form='glob'):
     .. code-block:: bash
 
         salt-run manage.status
+        salt-run manage.status timeout=5 gather_job_timeout=10
         salt-run manage.status tgt="webservers" expr_form="nodegroup"
     '''
     ret = {}
-    ret['up'], ret['down'] = _ping(tgt, expr_form, __opts__['timeout'])
+
+    if not timeout:
+        timeout = __opts__['timeout']
+    if not gather_job_timeout:
+        gather_job_timeout = __opts__['gather_job_timeout']
+
+    ret['up'], ret['down'] = _ping(tgt, expr_form, timeout, gather_job_timeout)
     return ret
 
 
@@ -148,7 +156,7 @@ def down(removekeys=False, tgt='*', expr_form='glob'):
     return ret
 
 
-def up(tgt='*', expr_form='glob'):  # pylint: disable=C0103
+def up(tgt='*', expr_form='glob', timeout=None, gather_job_timeout=None):  # pylint: disable=C0103
     '''
     Print a list of all of the minions that are up
 
@@ -157,9 +165,16 @@ def up(tgt='*', expr_form='glob'):  # pylint: disable=C0103
     .. code-block:: bash
 
         salt-run manage.up
+        salt-run manage.up timeout=5 gather_job_timeout=10
         salt-run manage.up tgt="webservers" expr_form="nodegroup"
     '''
-    ret = status(output=False, tgt=tgt, expr_form=expr_form).get('up', [])
+    ret = status(
+        output=False,
+        tgt=tgt,
+        expr_form=expr_form,
+        timeout=timeout,
+        gather_job_timeout=gather_job_timeout
+    ).get('up', [])
     return ret