Merge lp:~rconradharris/nova/bug705790 into lp:~hudson-openstack/nova/trunk

[Rick Harris]

This patch adds two flags:

--xenapi_remap_vbd_dev
--xenapi_remap_vbd_dev_prefix

If the plugged-in VBD dev is wrong, these configs let your remap it on the fly. This works around a bug in Ubuntu Maverick: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/684875

[Josh Kearney (jk0)]

lgtm - can't wait to get this in!

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Ed Leafe (ed-leafe)]

Lines 49-50 should be changed to use mapping instead of positional formatting:

LOG.debug(_('VBD %(vbd)s plugged into wrong dev, remapping to %(dev)s') % locals())

Otherwise, lgtm.

review: Approve

[OpenStack Infra (hudson-openstack)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Ed Leafe (ed-leafe)]

The revision looks great.

review: Approve

[Jay Pipes (jaypipes)]

lgtm.

review: Approve

=== modified file 'nova/virt/xenapi/vm_utils.py'
--- nova/virt/xenapi/vm_utils.py	2011-01-17 19:32:34 +0000
+++ nova/virt/xenapi/vm_utils.py	2011-01-21 22:18:26 +0000
@@ -22,6 +22,7 @@
 import os
 import pickle
 import re
+import time
 import urllib
 from xml.dom import minidom
 
@@ -589,6 +590,27 @@
     return None
 
 
+def remap_vbd_dev(dev):
+    """Return the appropriate location for a plugged-in VBD device
+
+    Ubuntu Maverick moved xvd? -> sd?. This is considered a bug and will be
+    fixed in future versions:
+        https://bugs.launchpad.net/ubuntu/+source/linux/+bug/684875
+
+    For now, we work around it by just doing a string replace.
+    """
+    # NOTE(sirp): This hack can go away when we pull support for Maverick
+    should_remap = FLAGS.xenapi_remap_vbd_dev
+    if not should_remap:
+        return dev
+
+    old_prefix = 'xvd'
+    new_prefix = FLAGS.xenapi_remap_vbd_dev_prefix
+    remapped_dev = dev.replace(old_prefix, new_prefix)
+
+    return remapped_dev
+
+
 def with_vdi_attached_here(session, vdi, read_only, f):
     this_vm_ref = get_this_vm_ref(session)
     vbd_rec = {}
@@ -611,7 +633,13 @@
         LOG.debug(_('Plugging VBD %s ... '), vbd)
         session.get_xenapi().VBD.plug(vbd)
         LOG.debug(_('Plugging VBD %s done.'), vbd)
-        return f(session.get_xenapi().VBD.get_device(vbd))
+        orig_dev = session.get_xenapi().VBD.get_device(vbd)
+        LOG.debug(_('VBD %s plugged as %s'), vbd, orig_dev)
+        dev = remap_vbd_dev(orig_dev)
+        if dev != orig_dev:
+            LOG.debug(_('VBD %(vbd)s plugged into wrong dev, '
+                        'remapping to %(dev)s') % locals())
+        return f(dev)
     finally:
         LOG.debug(_('Destroying VBD for VDI %s ... '), vdi)
         vbd_unplug_with_retry(session, vbd)
@@ -624,6 +652,7 @@
     DEVICE_DETACH_REJECTED.  For reasons which I don't understand, we're
     seeing the device still in use, even when all processes using the device
     should be dead."""
+    # FIXME(sirp): We can use LoopingCall here w/o blocking sleep()
     while True:
         try:
             session.get_xenapi().VBD.unplug(vbd)
 
=== modified file 'nova/virt/xenapi_conn.py'
--- nova/virt/xenapi_conn.py	2011-01-18 22:55:03 +0000
+++ nova/virt/xenapi_conn.py	2011-01-21 22:18:26 +0000
@@ -109,6 +109,14 @@
 flags.DEFINE_string('iqn_prefix',
                     'iqn.2010-10.org.openstack',
                     'IQN Prefix')
+# NOTE(sirp): This is a work-around for a bug in Ubuntu Maverick, when we pull
+# support for it, we should remove this
+flags.DEFINE_bool('xenapi_remap_vbd_dev', False,
+                  'Used to enable the remapping of VBD dev '
+                  '(Works around an issue in Ubuntu Maverick)')
+flags.DEFINE_string('xenapi_remap_vbd_dev_prefix', 'sd',
+                    'Specify prefix to remap VBD dev to '
+                    '(ex. /dev/xvdb -> /dev/sdb)')
 
 
 def get_connection(_):