openstack
/
nova
Code Issues Proposed changes

remove _rescan_iscsi from disconnect_volume_multipath_iscsi 

terminating instance that attached more than one volume, disconnect
the first volume is ok, but the first volume is not removed, then
disconnect the second volume, disconnect_volume_multipath_iscsi
will call _rescan_iscsi so that rescan the first device, although
the instance is destroyed, the first device is residual, therefor
we don't need rescan when disconnect volume.

Change-Id: I7f2c688aba9e69afaf370b2badc86a2bb3ee899d
Closes-Bug:#1402535
This commit is contained in:
Zhengguang 2015-05-21 02:31:50 +00:00
parent 98f7e8dae3
commit 2833f8c08f
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/virt/libvirt/test_volume.py
View File

@ -760,8 +760,6 @@ Setting up iSCSI targets: unused
('iscsiadm', '-m', 'node', '--rescan'),
('iscsiadm', '-m', 'session', '--rescan'),
('multipath', '-r'),
('iscsiadm', '-m', 'node', '--rescan'),
('iscsiadm', '-m', 'session', '--rescan'),
('multipath', '-r'),
('iscsiadm', '-m', 'discoverydb',
'-t', 'sendtargets',

1
nova/virt/libvirt/volume.py
View File

@ -600,7 +600,6 @@ class LibvirtISCSIVolumeDriver(LibvirtBaseVolumeDriver):
def _disconnect_volume_multipath_iscsi(self, iscsi_properties,
multipath_device):
self._rescan_iscsi()
self._rescan_multipath()
block_devices = self.connection._get_all_block_devices()
devices = []