Merge lp:~hopem/nova/icehouse-lp1506257 into lp:~ubuntu-server-dev/nova/icehouse

[Edward Hope-Morley]

[Corey Bryant (corey.bryant)]

Thanks Ed. I merged the diff from launchpad instead since the changelog signature had a different time stamp. https://launchpadlibrarian.net/222055256/nova_1%3A2014.1.5-0ubuntu1.3_1%3A2014.1.5-0ubuntu1.4.diff.gz

Unmerged revisions

707. By Edward Hope-Morley on 2015-10-15

* Protect against possible rpcapi mismatch on upgrade (LP: #1506257)
  - d/p/protect-against-upgrade-rpc-ver-mismatch.patch

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-08 14:45:33 +0000
+++ debian/changelog	2015-10-15 00:52:16 +0000
@@ -1,3 +1,10 @@
+nova (1:2014.1.5-0ubuntu1.4) UNRELEASED; urgency=medium
+
+  * Protect against possible rpcapi mismatch on upgrade (LP: #1506257)
+    - d/p/protect-against-upgrade-rpc-ver-mismatch.patch
+
+ -- Edward Hope-Morley <[e-mail]>  Wed, 14 Oct 2015 17:32:40 -0700
+
 nova (1:2014.1.5-0ubuntu1.3) trusty; urgency=medium
 
   * Attempting to attach the same volume multiple times can cause
 
=== added file 'debian/patches/protect-against-upgrade-rpc-ver-mismatch.patch'
--- debian/patches/protect-against-upgrade-rpc-ver-mismatch.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/protect-against-upgrade-rpc-ver-mismatch.patch	2015-10-15 00:52:16 +0000
@@ -0,0 +1,46 @@
+diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py
+index 2e39fd9..0b4eabe 100644
+--- a/nova/compute/rpcapi.py
++++ b/nova/compute/rpcapi.py
+@@ -816,6 +816,25 @@ class ComputeAPI(object):
+         cctxt = self.client.prepare(server=host, version=version)
+         return cctxt.call(ctxt, 'get_host_uptime')
+ 
++    def _reserve_block_device_name(self, ctxt, instance, device, volume_id,
++                                   disk_bus=None, device_type=None):
++        version = '3.16'
++        kw = {'instance': instance, 'device': device,
++              'volume_id': volume_id, 'disk_bus': disk_bus,
++              'device_type': device_type}
++
++        if not self.client.can_send_version(version):
++            # NOTE(russellb) Havana compat
++            version = self._get_compat_version('3.0', '2.3')
++            kw['instance'] = jsonutils.to_primitive(
++                    objects_base.obj_to_primitive(instance))
++            del kw['disk_bus']
++            del kw['device_type']
++
++        cctxt = self.client.prepare(server=_compute_host(None, instance),
++                version=version)
++        return cctxt.call(ctxt, 'reserve_block_device_name', **kw)
++
+     def reserve_block_device_name(self, ctxt, instance, device, volume_id,
+                                   disk_bus=None, device_type=None):
+         kw = {'instance': instance, 'device': device,
+@@ -829,7 +848,14 @@ class ComputeAPI(object):
+ 
+         cctxt = self.client.prepare(server=_compute_host(None, instance),
+                 version=version)
+-        volume_bdm = cctxt.call(ctxt, 'reserve_block_device_name', **kw)
++        try:
++            volume_bdm = cctxt.call(ctxt, 'reserve_block_device_name', **kw)
++        except messaging.rpc.client.RemoteError:
++            # NOTE(dosaboy): catch rpc api version mismatch (see bug 1506257)
++            volume_bdm = self._reserve_block_device_name(ctxt, instance,
++                                                         device, volume_id,
++                                                         disk_bus, device_type)
++
+         if not isinstance(volume_bdm, block_device_obj.BlockDeviceMapping):
+             volume_bdm = block_device_obj.BlockDeviceMapping.get_by_volume_id(
+                 ctxt, volume_id)
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2015-09-08 14:45:33 +0000
+++ debian/patches/series	2015-10-15 00:52:16 +0000
@@ -7,3 +7,4 @@
 add-support-for-syslog-connect-retries.patch
 clean-shutdown.patch
 fix-creating-bdm-for-failed-volume-attachment.patch
+protect-against-upgrade-rpc-ver-mismatch.patch