openstack/nova
Code Issues Proposed changes

Merge "Rollback of live-migration fails with the NFS driver"

Browse Source
This commit is contained in:
Jenkins
2016-01-04 10:58:10 +00:00
committed by Gerrit Code Review
parent c2a836783a f00f3bee23
commit d9b5df4439
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/unit/virt/libvirt/volume/test_nfs.py
View File

@@ -68,6 +68,10 @@ class LibvirtNFSVolumeDriverTestCase(test_volume.LibvirtVolumeBaseTestCase):
None, None, None, 'umount', 'umount: target is busy.')
libvirt_driver.disconnect_volume(connection_info, "vde")
self.assertTrue(mock_LOG_debug.called)
mock_utils_exe.side_effect = processutils.ProcessExecutionError(
None, None, None, 'umount', 'umount: not mounted.')
libvirt_driver.disconnect_volume(connection_info, "vde")
self.assertTrue(mock_LOG_debug.called)
mock_utils_exe.side_effect = processutils.ProcessExecutionError(
None, None, None, 'umount', 'umount: Other error.')
libvirt_driver.disconnect_volume(connection_info, "vde")

3
nova/virt/libvirt/volume/nfs.py
View File

@@ -73,6 +73,9 @@ class LibvirtNFSVolumeDriver(fs.LibvirtBaseFileSystemVolumeDriver):
if ('device is busy' in six.text_type(exc) or
'target is busy' in six.text_type(exc)):
LOG.debug("The NFS share %s is still in use.", export)
elif ('not mounted' in six.text_type(exc)):
LOG.debug("The NFS share %s has already been unmounted.",
export)
else:
LOG.exception(_LE("Couldn't unmount the NFS share %s"), export)