diff --git a/os_brick/initiator/linuxscsi.py b/os_brick/initiator/linuxscsi.py index 80c4e0192..9c631dc64 100644 --- a/os_brick/initiator/linuxscsi.py +++ b/os_brick/initiator/linuxscsi.py @@ -235,8 +235,17 @@ class LinuxSCSI(executor.Executor): def _remove_scsi_symlinks(self, devices_names): devices = ['/dev/' + dev for dev in devices_names] links = glob.glob('/dev/disk/by-id/scsi-*') - unlink = [link for link in links - if os.path.realpath(link) in devices] + unlink = [] + for link in links: + try: + if os.path.realpath(link) in devices: + unlink.append(link) + except OSError: + # A race condition in Python's posixpath:realpath just occurred + # so we can ignore it because the file was just removed between + # a check if file exists and a call to os.readlink + continue + if unlink: priv_rootwrap.unlink_root(no_errors=True, *unlink) diff --git a/os_brick/tests/initiator/test_linuxscsi.py b/os_brick/tests/initiator/test_linuxscsi.py index f876dadd5..77b320834 100644 --- a/os_brick/tests/initiator/test_linuxscsi.py +++ b/os_brick/tests/initiator/test_linuxscsi.py @@ -867,6 +867,18 @@ loop0 0""" realpath_mock.assert_has_calls([mock.call(g) for g in paths]) unlink_mock.assert_not_called() + @mock.patch.object(linuxscsi.priv_rootwrap, 'unlink_root') + @mock.patch('glob.glob') + @mock.patch('os.path.realpath', side_effect=[OSError, '/dev/sda']) + def test_remove_scsi_symlinks_race_condition(self, realpath_mock, + glob_mock, unlink_mock): + paths = ['/dev/disk/by-id/scsi-wwid1', '/dev/disk/by-id/scsi-wwid2'] + glob_mock.return_value = paths + self.linuxscsi._remove_scsi_symlinks(['sda']) + glob_mock.assert_called_once_with('/dev/disk/by-id/scsi-*') + realpath_mock.assert_has_calls([mock.call(g) for g in paths]) + unlink_mock.assert_called_once_with(paths[1], no_errors=True) + @mock.patch('glob.glob') def test_get_hctl_with_target(self, glob_mock): glob_mock.return_value = [