Attachment 292344 Details for Bug 371251 – Second patch - if is_xenstored_running() look at /sys/hypervisor/uuid else /var/lib/xenstored/tdb

[patch] Second patch - if is_xenstored_running() look at /sys/hypervisor/uuid else /var/lib/xenstored/tdb

fix_sosreport_without_xenstored.v2.patch (text/plain), 1.79 KB, created by Steve on 2008-01-21 08:46:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve

Created: 2008-01-21 08:46:51 UTC

Size: 1.79 KB

patch

obsolete

>--- /usr/lib/python2.4/site-packages/sos/plugins/xen.py.orig	2008-01-08 10:22:46.000000000 +0900
>+++ /usr/lib/python2.4/site-packages/sos/plugins/xen.py	2008-01-08 11:20:41.000000000 +0900
>@@ -38,6 +38,11 @@
>             return False
>         return True
> 
>+    def is_running_xenstored(self):
>+        xs_pid = os.popen("pidof xenstored").read()
>+        xs_pidnum = re.split('\n$',xs_pid)[0]
>+        return xs_pidnum.isdigit()
>+
>     def domCollectProc(self):
>         self.addCopySpec("/proc/xen/balloon")
>         self.addCopySpec("/proc/xen/capabilities")
>@@ -63,12 +68,21 @@
>             # default of dom0, collect lots of system information
>             self.addCopySpec("/var/log/xen")
>             self.addCopySpec("/etc/xen")
>-            self.collectExtOutput("/usr/bin/xenstore-ls")
>             self.collectExtOutput("/usr/sbin/xm dmesg")
>             self.collectExtOutput("/usr/sbin/xm info")
>             self.collectExtOutput("/usr/sbin/brctl show")
>             self.domCollectProc()
>-            self.addCopySpec("/sys/hypervisor")
>+            self.addCopySpec("/sys/hypervisor/version")
>+            self.addCopySpec("/sys/hypervisor/compilation")
>+            self.addCopySpec("/sys/hypervisor/properties")
>+            self.addCopySpec("/sys/hypervisor/type")
>+            if is_xenstored_running(): 
>+                self.addCopySpec("/sys/hypervisor/uuid")
>+                self.collectExtOutput("/usr/bin/xenstore-ls")
>+            else:
>+                # we need tdb instead of xenstore-ls if cannot get it.
>+                self.addCopySpec("/var/lib/xenstored/tdb")
>+                
>             # FIXME: we *might* want to collect things in /sys/bus/xen*,
>             # /sys/class/xen*, /sys/devices/xen*, /sys/modules/blk*,
>             # /sys/modules/net*, but I've never heard of them actually being

Actions: View | Diff

Attachments on bug 371251: 292343 | 292344