Add more explanation

mcpanayides · Mar 28, 2017 · 2ecbb72 · 2ecbb72
1 parent 3e48e2d
commit 2ecbb72
Showing 1 changed file with 12 additions and 2 deletions.
diff --git 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: