fix a race based on rwbarton's error message

[invirt/packages/invirt-remote.git] / files / usr / sbin / sipb-xen-listvms

diff --git a/files/usr/sbin/sipb-xen-listvms b/files/usr/sbin/sipb-xen-listvms
index 7884d87..85e9713 100755 (executable)
--- a/files/usr/sbin/sipb-xen-listvms
+++ b/files/usr/sbin/sipb-xen-listvms
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import sys
 #!/usr/bin/python
 
 import sys

+import time

 sys.path.insert(0, '/usr/lib/xen-3.1-1/lib/python')
 from xen.lowlevel.xs import xs
 
 sys.path.insert(0, '/usr/lib/xen-3.1-1/lib/python')
 from xen.lowlevel.xs import xs
 

@@ -8,12 +9,15 @@ trans = xs()
 
 def live_vms():
     domids = set(trans.ls('', '/local/domain'))
 
 def live_vms():
     domids = set(trans.ls('', '/local/domain'))

-    domids.remove('0')
+    domids.discard('0')

 
     vms = dict()
 
     for domid in domids:
 
     vms = dict()
 
     for domid in domids:

-        name, data = get_dom(int(domid))
+        try:
+            name, data = get_dom(int(domid))
+        except ValueError:
+            pass # went down since we started

         if name.startswith('d_'):
             name = name[2:]
             vms[name] = data
         if name.startswith('d_'):
             name = name[2:]
             vms[name] = data

@@ -28,13 +32,18 @@ def get_dom(domid):
     # uptime
     data['vm'] = trans.read('', '/local/domain/%d/vm' % domid)
     data['start_time'] = float(trans.read('', '%s/start_time' % data['vm']))
     # uptime
     data['vm'] = trans.read('', '/local/domain/%d/vm' % domid)
     data['start_time'] = float(trans.read('', '%s/start_time' % data['vm']))

+    data['uptime'] = time.time()-data['start_time']

     
     return name, data
 
 if __name__ == '__main__':
     vms = live_vms()
     
     return name, data
 
 if __name__ == '__main__':
     vms = live_vms()

-    if '--pickle' in sys.argv[1:]:
+    if '--json' in sys.argv[1:]:
+        import cjson
+        print cjson.encode(vms)
+    elif '--pickle' in sys.argv[1:]:

         import cPickle
         import cPickle

-        cPickle.dump(vms, sys.stdout)
+        cPickle.dump(vms, sys.stdout, cPickle.HIGHEST_PROTOCOL)

     else:
     else:

-        print vms
+        import yaml
+        print yaml.dump(vms, Dumper=yaml.CSafeDumper, default_flow_style=False)