Zencommand tasks get stuck

ZEN-19208 Back-porting two more PRs to address this issue: #1088 #1092
zenoss · Oct 8, 2015 · f6edeae · f6edeae
1 parent 15faaa7
commit f6edeae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Products/DataCollector/CollectorClient.py b/Products/DataCollector/CollectorClient.py
@@ -172,7 +172,7 @@ def commandsFinished(self):
         return len(self.results) == len(self._commands)
 
 
-    def clientFinished(self):
+    def clientFinished(self, error=None):
         """
         Tell the datacollector that we are all done
         """

diff --git a/Products/DataCollector/SshClient.py b/Products/DataCollector/SshClient.py
@@ -439,7 +439,7 @@ def serviceStopped(self, *args, **kwargs):
             else:
                 msg = "SSH authentication failed - no password or public key specified"
             self._handleFailure(msg, event_key="sshClientAuth")
-            self.factory.clientFinished(msg)
+            self.factory.clientFinished(LoginFailed(msg))
         else:
             sendEvent(self, "Authentication succeeded for username %s" % self.user, severity=Event.Clear,
                       event_key="sshClientAuth")

diff --git a/Products/ZenRRD/zencommand.py b/Products/ZenRRD/zencommand.py
@@ -219,9 +219,9 @@ def clientConnectionFailed(self, connector, reason):
         """
         msg = reason.getErrorMessage()
         if self.connect_defer and not self.connect_defer.called:
-            self.connect_defer.errback(msg)
+            self.connect_defer.errback(reason)
         if self.close_defer and not self.close_defer.called:
-            self.close_defer.errback(msg)
+            self.close_defer.errback(reason)
 
         self.clientFinished()