Changeset 1598 for trunk/packages/invirt-remote-server/python

Timestamp:

Nov 10, 2008, 3:20:05 PM (16 years ago)

Author:

broder

Message:

Don't fail to execute remctls if a single server is down

File:

• trunk/packages/invirt-remote-server/python/remote/bcast.py (modified) (1 diff)

trunk/packages/invirt-remote-server/python/remote/bcast.py

@@ -10 +10 @@
     """
     pipes = [(host,
-              Popen(['remctl', host, 'remote', 'web', cmd], stdout=PIPE))
+              Popen(['remctl', host, 'remote', 'web', cmd], stdout=PIPE, stderr=PIPE))
              for host in hosts]
-    outputs = [(s, p.communicate()[0]) for (s, p) in pipes]
+    outputs = dict((s, p.communicate()) for (s, p) in pipes)
     for (s, p) in pipes:
         if p.returncode != 0:
-            raise RuntimeError("remctl to host %s returned non-zero exit status %d"
-                               % (s, p.returncode))
-    return [(s, yaml.load(o, yaml.CSafeLoader)) for (s, o) in outputs]
+            if outputs[s][1].startswith('remctl: cannot connect to %s' % s):
+                del outputs[s]
+            else:
+                raise RuntimeError("remctl to host %s returned non-zero exit status %d"
+                                   % (s, p.returncode))
+    return [(s, yaml.load(o[1], yaml.CSafeLoader)) for (s, o) in outputs.iteritems()]