Merge lp:~berendt/nova/lp719325 into lp:~hudson-openstack/nova/trunk

[Christian Berendt]

introducing a new flag timeout_nbd for manually setting the time in seconds for waiting for an upcoming NBD device

[Jay Pipes (jaypipes)]

Think you might have forgotten to bzr commit or bzr push, Christian :) Empty diff.

[Christian Berendt (berendt)]

I always forget one of those.. This time it was commit.. Knarf..

[lp:~berendt/nova/lp719325]

707. By Christian Berendt on 2011-02-21

introducing a new flag timeout_nbd for manually setting the time in seconds for waiting for an upcoming NBD device

[Jay Pipes (jaypipes)]

lgtm :)

review: Approve

[Todd Willey (xtoddx)]

This change is fine, but we really should document flags somewhere.

review: Approve

=== modified file 'nova/virt/disk.py'
--- nova/virt/disk.py	2011-01-13 23:13:31 +0000
+++ nova/virt/disk.py	2011-02-21 15:19:16 +0000
@@ -38,6 +38,8 @@
                      'minimum size in bytes of root partition')
 flags.DEFINE_integer('block_size', 1024 * 1024 * 256,
                      'block_size to use for dd')
+flags.DEFINE_integer('timeout_nbd', 10,
+                     'time to wait for a NBD device coming up')
 
 
 def extend(image, size):
@@ -117,7 +119,7 @@
         utils.execute('sudo qemu-nbd -c %s %s' % (device, image))
         # NOTE(vish): this forks into another process, so give it a chance
         #             to set up before continuuing
-        for i in xrange(10):
+        for i in xrange(FLAGS.timeout_nbd):
             if os.path.exists("/sys/block/%s/pid" % os.path.basename(device)):
                 return device
             time.sleep(1)