diff --git a/os_brick/initiator/connectors/iscsi.py b/os_brick/initiator/connectors/iscsi.py index 88e35f377..4bdfb8a01 100644 --- a/os_brick/initiator/connectors/iscsi.py +++ b/os_brick/initiator/connectors/iscsi.py @@ -630,18 +630,23 @@ class ISCSIConnector(base.BaseLinuxConnector, base_iscsi.BaseISCSIConnector): """ device = hctl = None portal = props['target_portal'] - session, manual_scan = self._connect_to_iscsi_portal(props) - do_scans = rescans > 0 or manual_scan - # Scan is sent on connect by iscsid, but we must do it manually on - # manual scan mode. This scan cannot count towards total rescans. - if manual_scan: - num_rescans = -1 - seconds_next_scan = 0 - else: - num_rescans = 0 - seconds_next_scan = 4 + try: + session, manual_scan = self._connect_to_iscsi_portal(props) + except Exception: + LOG.exception('Exception connecting to %s', portal) + session = None if session: + do_scans = rescans > 0 or manual_scan + # Scan is sent on connect by iscsid, but we must do it manually on + # manual scan mode. This scan cannot count towards total rescans. + if manual_scan: + num_rescans = -1 + seconds_next_scan = 0 + else: + num_rescans = 0 + seconds_next_scan = 4 + data['num_logins'] += 1 LOG.debug('Connected to %s', portal) while do_scans: diff --git a/os_brick/tests/initiator/connectors/test_iscsi.py b/os_brick/tests/initiator/connectors/test_iscsi.py index e81b5dcd0..48558cc38 100644 --- a/os_brick/tests/initiator/connectors/test_iscsi.py +++ b/os_brick/tests/initiator/connectors/test_iscsi.py @@ -1533,6 +1533,18 @@ Setting up iSCSI targets: unused expected.update(failed_logins=1, stopped_threads=1) self.assertDictEqual(expected, data) + @mock.patch.object(iscsi.ISCSIConnector, '_connect_to_iscsi_portal') + def test_connect_vol_with_connection_failure(self, connect_mock): + data = self._get_connect_vol_data() + + connect_mock.side_effect = Exception() + + self.connector._connect_vol(3, self.CON_PROPS, data) + + expected = self._get_connect_vol_data() + expected.update(failed_logins=1, stopped_threads=1) + self.assertDictEqual(expected, data) + @mock.patch('os_brick.utils._time_sleep', mock.Mock()) @mock.patch.object(linuxscsi.LinuxSCSI, 'scan_iscsi') @mock.patch.object(linuxscsi.LinuxSCSI, 'device_name_by_hctl', diff --git a/releasenotes/notes/bug-1915678-901a6bd24ecede72.yaml b/releasenotes/notes/bug-1915678-901a6bd24ecede72.yaml new file mode 100644 index 000000000..6e6f3d0ee --- /dev/null +++ b/releasenotes/notes/bug-1915678-901a6bd24ecede72.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + `Bug #1915678 `_: Fix + unhandled exception during iscsi volume attachment with multipath enabled + that resulted in the cinder-volume service becoming stuck and requiring + a restart.