[Pure Storage] Uniform Sync Replication disconnect
When a sync replicated volume is disconnected, the host connection
on the secondary array is not correctly removed.
This patch resolves that by ensuring the remote host connections
are also removed before the final disconnection of the volume from
the host.
Closes-Bug: #2029005
Change-Id: If1c08e918710b809ec62612e77740131914e2233
(cherry picked from commit 8e1d5b4aeb
)
This commit is contained in:
parent
265d813dc9
commit
8e6ce2d1fc
|
@ -4254,7 +4254,7 @@ class PureFCDriverTestCase(PureBaseSharedDriverTestCase):
|
|||
self.driver.terminate_connection(vol, FC_CONNECTOR)
|
||||
mock_disconnect.assert_has_calls([
|
||||
mock.call(mock_secondary, vol, FC_CONNECTOR,
|
||||
is_multiattach=False, remove_remote_hosts=False),
|
||||
is_multiattach=False, remove_remote_hosts=True),
|
||||
mock.call(self.array, vol, FC_CONNECTOR,
|
||||
is_multiattach=False, remove_remote_hosts=False)
|
||||
])
|
||||
|
|
|
@ -927,7 +927,7 @@ class PureBaseVolumeDriver(san.SanDriver):
|
|||
for array in self._uniform_active_cluster_target_arrays:
|
||||
try:
|
||||
self._disconnect(array, volume, connector,
|
||||
remove_remote_hosts=False,
|
||||
remove_remote_hosts=True,
|
||||
is_multiattach=multiattach)
|
||||
except purestorage.PureError as err:
|
||||
# Swallow any exception, just warn and continue
|
||||
|
@ -3273,7 +3273,7 @@ class PureFCDriver(PureBaseVolumeDriver, driver.FibreChannelDriver):
|
|||
for array in self._uniform_active_cluster_target_arrays:
|
||||
try:
|
||||
no_more_connections = self._disconnect(
|
||||
array, volume, connector, remove_remote_hosts=False,
|
||||
array, volume, connector, remove_remote_hosts=True,
|
||||
is_multiattach=multiattach)
|
||||
if no_more_connections:
|
||||
unused_wwns += self._get_array_wwns(array)
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
Pure Storage Cinder Driver: Fixed `bug 2029005
|
||||
<https://bugs.launchpad.net/cinder/+bug/2029005>`__ to correctly
|
||||
disconnect a sync replicated volume from host on the secondary
|
||||
array when uniform option is set to True.
|
Loading…
Reference in New Issue