openstack
/
nova
Code Issues Proposed changes

Merge "libvirt: add debug logging in detach_device_with_retry" into stable/ocata

This commit is contained in:
Jenkins 2017-08-11 20:12:50 +00:00 committed by Gerrit Code Review
parent e79f91411e 527834dea8
commit 0431b1ddac
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/virt/libvirt/guest.py
View File

@ -395,6 +395,9 @@ class Guest(object):
# Raise DeviceNotFound if the device isn't found during detach
try:
self.detach_device(conf, persistent=persistent, live=live)
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():
errcode = ex.get_error_code()
@ -417,7 +420,9 @@ class Guest(object):
if conf is None:
raise exception.DeviceNotFound(device=alternative_device_name)
LOG.debug('Attempting initial detach for device %s', device)
_try_detach_device(conf, persistent, live)
LOG.debug('Start retrying detach until device %s is gone.', device)
@loopingcall.RetryDecorator(max_retry_count=max_retry_count,
inc_sleep_time=inc_sleep_time,