Merge "libvirt: Ignore device already in the process of unplug errors" into stable/wallaby

Author: Zuul

nova/tests/unit/virt/libvirt/test_guest.py

@@ -377,6 +377,48 @@ def test_detach_device_with_retry_first_detach_device_missing(self):
             error_message="device not found: disk vdb not found",
             supports_device_missing=True)
 
+    def test_detach_device_with_already_in_process_of_unplug_error(self):
+        # Assert that DeviceNotFound is raised when encountering
+        # https://bugzilla.redhat.com/show_bug.cgi?id=1878659
+        # This is raised as QEMU returns a VIR_ERR_INTERNAL_ERROR when
+        # a request to device_del is made while another is about to complete.
+
+        self.domain.isPersistent.return_value = True
+        conf = mock.Mock(spec=vconfig.LibvirtConfigGuestDevice)
+        conf.to_xml.return_value = "</xml>"
+
+        existing_unplug_exc = fakelibvirt.make_libvirtError(
+            fakelibvirt.libvirtError, "",
+            error_message='device vdb is already in the process of unplug',
+            error_code=fakelibvirt.VIR_ERR_INTERNAL_ERROR,
+            error_domain=fakelibvirt.VIR_FROM_DOMAIN
+        )
+        device_missing_exc = fakelibvirt.make_libvirtError(
+            fakelibvirt.libvirtError, "",
+            error_message='device not found: disk vdb not found',
+            error_code=fakelibvirt.VIR_ERR_DEVICE_MISSING,
+            error_domain=fakelibvirt.VIR_FROM_DOMAIN
+        )
+
+        # Raise VIR_ERR_INTERNAL_ERROR on the second call before raising
+        # VIR_ERR_DEVICE_MISSING to mock the first call successfully detaching
+        # the device asynchronously.
+        self.domain.detachDeviceFlags.side_effect = [
+            None,
+            existing_unplug_exc,
+            device_missing_exc
+        ]
+
+        retry_detach = self.guest.detach_device_with_retry(
+            mock.Mock(return_value=conf),
+            'vdb',
+            live=True,
+            inc_sleep_time=.01
+        )
+
+        # Assert that we raise exception.DeviceNotFound
+        self.assertRaises(exception.DeviceNotFound, retry_detach)
+
     def test_get_xml_desc(self):
         self.guest.get_xml_desc()
         self.domain.XMLDesc.assert_called_once_with(flags=0)

nova/virt/libvirt/guest.py

@@ -434,12 +434,27 @@ def _try_detach_device(conf, persistent=False, live=False):
                     LOG.debug('Successfully detached device %s from guest. '
                               'Persistent? %s. Live? %s',
                               device, persistent, live)
-
             except libvirt.libvirtError as ex:
                 with excutils.save_and_reraise_exception(reraise=False) as ctx:
-                    if ex.get_error_code() == libvirt.VIR_ERR_DEVICE_MISSING:
+                    code = ex.get_error_code()
+                    msg = ex.get_error_message()
+                    if code == libvirt.VIR_ERR_DEVICE_MISSING:
                         raise exception.DeviceNotFound(
                             device=alternative_device_name)
+                    # NOTE(lyarwood): https://bugzilla.redhat.com/1878659
+                    # Ignore this known QEMU bug for the time being allowing
+                    # our retry logic to fire again and hopefully see that
+                    # the device has been removed asynchronously by QEMU
+                    # in the meantime when the next call to detach raises
+                    # VIR_ERR_DEVICE_MISSING.
+                    if (code == libvirt.VIR_ERR_INTERNAL_ERROR and
+                        msg and 'already in the process of unplug' in msg
+                    ):
+                        LOG.debug('Ignoring QEMU rejecting our request to '
+                                  'detach as it is caused by a previous '
+                                  'request still being in progress.')
+                        return
+
                     # Re-raise the original exception if we're not raising
                     # DeviceNotFound instead. This will avoid logging of a
                     # "Original exception being dropped" traceback.