From c0839fa55067e96bf577d16b7b9d825ae7b52aba Mon Sep 17 00:00:00 2001 From: "Walter A. Boring IV" Date: Fri, 17 Jul 2015 15:42:43 -0700 Subject: [PATCH] Remove the iSCSI rescan during disconnect Doing an iSCSI rescan at disconnect time is pretty dangerous to do. iSCSI rescan doesn't make volumes go away, it makes them show back up. So during Nova live migration it will make local scsi volumes show back up. Nova live migration first loops over volumes and calls disconnect_volume, then after that it loops over the volumes again and call's cinder to terminate_connection. If disconnect_volume does a rescan, then volumes there were removed during previous calls will show back up, because cinder's driver hasn't had a chance to terminate the connection yet from the array. Closes-Bug: #1483326 Change-Id: I8708db16a4b9057b09abad9f956fa5a3bb4ba54c --- os_brick/initiator/connector.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/os_brick/initiator/connector.py b/os_brick/initiator/connector.py index cd0879598..4322f9021 100644 --- a/os_brick/initiator/connector.py +++ b/os_brick/initiator/connector.py @@ -456,12 +456,6 @@ class ISCSIConnector(InitiatorConnector): target_iqn(s) - iSCSI Qualified Name target_lun(s) - LUN id of the volume """ - # Moved _rescan_iscsi and _rescan_multipath - # from _disconnect_volume_multipath_iscsi to here. - # Otherwise, if we do rescan after _linuxscsi.remove_multipath_device - # but before logging out, the removed devices under /dev/disk/by-path - # will reappear after rescan. - self._rescan_iscsi() if self.use_multipath: self._rescan_multipath() host_device = multipath_device = None