Changeset 1695:5ead0b1ceb91

Timestamp:

07/10/08 12:05:18 (2 months ago)

Author:

klai@…

Branch:

default

Message:

Get better debugging from failed system commands

Location:

src/Tycoon/Virtualization

Files:

• OSUtil.py (modified) (6 diffs)
• XenResources.py (modified) (1 diff)
• XenUtil.py (modified) (3 diffs)

src/Tycoon/Virtualization/OSUtil.py

@@ -153 +153 @@
     find_file = staticmethod(find_file)
     
-    def do(cmd, *args):
-        """Run a command and get the return status.
-        """
-        s = cmd + ' ' + ' '.join(args)
-        INFO(s + ' started')
-        d = utils.getProcessValue(cmd, args)
-        yield d
-        if type(d.result) != int:
-            ERROR(s + " returned %s" % (d.result,))
-            yield False
-        else:
-            INFO(s + ' returned %d' % (d.result,))
-            yield True
-        
-    do = staticmethod(deferredGenerator(do))
-
-    def do2(reactor, cmd, *args):
+    def do2(reactor, cmd, *args, **flags):
         """Run a command and get return status, stdout, and stderr.
         """
@@ -178 +162 @@
         reactor.spawnProcess(protocol, cmd, (cmd,) + args)
         yield d
-        INFO(s + ' returned %d' % (d.result[0],))
-        #INFO(s + '"%s"' % (d.result[1],))
-        #INFO(s + '"%s"' % (d.result[2],))
+        if d.result[0] != 0 and not 'ignore_error' in flags:
+            ERROR("%s failed with %s" % (cmd, d.result,))
+        else:
+            INFO(s + ' succeeded with value %d' % (d.result[0]))
         yield d.result
         
@@ -222 +207 @@
     get_dir_size = staticmethod(deferredGenerator(get_dir_size))
         
-    def grow_sparse_file_system(file_system, new_size, old_size):
+    def grow_sparse_file_system(reactor, file_system, new_size, old_size):
         # Write a single byte at the last seek position.
-        d = OSUtil.do(
-            '/bin/dd', 'if=/dev/zero', 'of=%s' % (file_system,),
+        d = OSUtil.do2(
+            reactor, '/bin/dd', 'if=/dev/zero', 'of=%s' % (file_system,),
             'seek=%d' % (new_size - 1,), 'bs=1', 'count=1')
         return d
     grow_sparse_file_system = staticmethod(grow_sparse_file_system)
 
-    def grow_dense_file_system(file_system, new_size, old_size):
+    def grow_dense_file_system(reactor, file_system, new_size, old_size):
         m = (new_size - old_size) / 1048576
         seek = old_size / 1048576
-        d = OSUtil.do(
-            '/bin/dd', 'if=/dev/zero', 'of=%s' % (file_system,),
+        d = OSUtil.do2(
+            reactor, '/bin/dd', 'if=/dev/zero', 'of=%s' % (file_system,),
             'seek=%d' % (seek,), 'bs=1M', 'count=%d' % (m,))
         return d
     grow_dense_file_system = staticmethod(grow_dense_file_system)
 
-    def resize_file_system(file_system, size):
+    def resize_file_system(reactor, file_system, size):
         """Resize a file system file.
         """
@@ -253 +238 @@
             if sparse:
                 d = OSUtil.grow_sparse_file_system(
-                    file_system, real_size, old_size)
+                    reactor, file_system, real_size, old_size)
             else:
                 d = OSUtil.grow_dense_file_system(
-                    file_system, real_size, old_size)
+                    reactor, file_system, real_size, old_size)
             yield d
-            d = OSUtil.do('/sbin/e2fsck','-f', '-y', file_system)
+            d = OSUtil.do2(
+                reactor, '/sbin/e2fsck','-f', '-y', file_system, ignore_error=1)
             yield d
-            d = OSUtil.do('/sbin/resize2fs', file_system)
+            d = OSUtil.do2(reactor, '/sbin/resize2fs', file_system)
             yield d
         elif real_size < old_size:
-            d = OSUtil.do('/sbin/e2fsck','-f', '-y', file_system)
+            d = OSUtil.do2(
+                reactor, '/sbin/e2fsck','-f', '-y', file_system, ignore_error=1)
             yield d
-            d = OSUtil.do('/sbin/resize2fs', file_system, "%dM" % (m,))
+            d = OSUtil.do2(
+                reactor, '/sbin/resize2fs', file_system, "%dM" % (m,))
             yield d
             f = file(file_system, "a+")
@@ -280 +268 @@
         d = OSUtil.do2(reactor, s, root, '/usr/sbin/useradd', account_name)
         yield d
-        if d.result[0] != 0:
-            ERROR(d.result)
         d = OSUtil.do2(reactor, s, root, '/usr/bin/id', account_name)
         #o = os.popen("%s %s id %s" % (s, root, account_name)).readline()
         yield d
-        if d.result[0] != 0:
-            ERROR(d.result)
         r = re.compile("uid=([0-9]+)\([a-z0-9_]+\) gid=([0-9]+)\([a-z0-9_]+\)")
         m = r.match(d.result[1])
@@ -416 +400 @@
         
         quota = False
-        d = OSUtil.do2(reactor, '/sbin/quotaon', '-p', root)
+        d = OSUtil.do2(reactor, '/sbin/quotaon', '-p', root, ignore_error=1)
         yield d
         # Quotaon returns stderr on error instead a proper status code.

src/Tycoon/Virtualization/XenResources.py

@@ -288 +288 @@
         """
         """
-        d = OSUtil.resize_file_system(file_system_path, new_size)
+        d = OSUtil.resize_file_system(
+            self.__reactor, file_system_path, new_size)
         yield d
         account['file_system_size'] = d.result

src/Tycoon/Virtualization/XenUtil.py

@@ -490 +490 @@
                 "Requested file system size %d is too small for file system image size %d" % (file_system_size, size))
         
-        d = OSUtil.resize_file_system(dest, file_system_size)
+        d = OSUtil.resize_file_system(self.__reactor, dest, file_system_size)
         yield d
         yield dest, d.result
@@ -505 +505 @@
         else:
             os.mkdir(mount_dir)
-
+            
         d = OSUtil.do2(
             self.__reactor, "/bin/mount", "-o", "loop", file_system_fn, 
@@ -511 +511 @@
         yield d
         if d.result[0] != 0:
-            INFO("/bin/mount failed with value %d" % (d.result,))
             yield False
         else: