From 3e48e2d3617ac647af8a64bd7a69b4a111f178b0 Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Tue, 28 Mar 2017 11:17:10 -0600 Subject: [PATCH 1/2] Remove usually-wrong advice to raise worker threads --- salt/client/__init__.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/salt/client/__init__.py b/salt/client/__init__.py index b684d951a1cf..a956427088ad 100644 --- a/salt/client/__init__.py +++ b/salt/client/__init__.py @@ -1764,9 +1764,8 @@ def pub(self, payload = channel.send(payload_kwargs, timeout=timeout) except SaltReqTimeoutError: raise SaltReqTimeoutError( - 'Salt request timed out. The master is not responding. ' - 'If this error persists after verifying the master is up, ' - 'worker_threads may need to be increased.' + 'Salt request timed out. The master is not responding. You ' + 'may need to run your command with `--async`.' ) if not payload: @@ -1869,9 +1868,8 @@ def pub_async(self, payload = yield channel.send(payload_kwargs, timeout=timeout) except SaltReqTimeoutError: raise SaltReqTimeoutError( - 'Salt request timed out. The master is not responding. ' - 'If this error persists after verifying the master is up, ' - 'worker_threads may need to be increased.' + 'Salt request timed out. The master is not responding. You ' + 'may need to run your command with `--async`.' ) if not payload: From 2ecbb72ab0649b36774b81170697e4d1a37a4bea Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Tue, 28 Mar 2017 12:30:37 -0600 Subject: [PATCH 2/2] Add more explanation --- salt/client/__init__.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/salt/client/__init__.py b/salt/client/__init__.py index a956427088ad..b51c166d8e56 100644 --- a/salt/client/__init__.py +++ b/salt/client/__init__.py @@ -1765,7 +1765,12 @@ def pub(self, except SaltReqTimeoutError: raise SaltReqTimeoutError( 'Salt request timed out. The master is not responding. You ' - 'may need to run your command with `--async`.' + 'may need to run your command with `--async` in order to ' + 'bypass the congested event bus. With `--async`, the CLI tool ' + 'will print the job id (jid) and exit immediately without ' + 'listening for responses. You can then use ' + '`salt-run jobs.lookup_jid` to look up the results of the job ' + 'in the job cache later.' ) if not payload: @@ -1869,7 +1874,12 @@ def pub_async(self, except SaltReqTimeoutError: raise SaltReqTimeoutError( 'Salt request timed out. The master is not responding. You ' - 'may need to run your command with `--async`.' + 'may need to run your command with `--async` in order to ' + 'bypass the congested event bus. With `--async`, the CLI tool ' + 'will print the job id (jid) and exit immediately without ' + 'listening for responses. You can then use ' + '`salt-run jobs.lookup_jid` to look up the results of the job ' + 'in the job cache later.' ) if not payload: