openstack
/
manila
Code Issues Proposed changes

Merge "[NetApp] Fix race condition issues on vserver deletion"

This commit is contained in:
Zuul 2019-06-12 15:48:32 +00:00 committed by Gerrit Code Review
parent 35d327e463 4fbf1a2d9d
commit 86823b5cb6
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py
View File

@ -212,8 +212,11 @@ class NetAppCmodeMultiSVMFileStorageLibrary(
except Exception:
with excutils.save_and_reraise_exception():
LOG.error("Failed to configure Vserver.")
# NOTE(dviroel): At this point, the lock was already acquired
# by the caller of _create_vserver.
self._delete_vserver(vserver_name,
security_services=security_services)
security_services=security_services,
needs_lock=False)
def _get_valid_ipspace_name(self, network_id):
"""Get IPspace name according to network id."""
@ -357,7 +360,8 @@ class NetAppCmodeMultiSVMFileStorageLibrary(
self._delete_vserver(vserver, security_services=security_services)
@na_utils.trace
def _delete_vserver(self, vserver, security_services=None):
def _delete_vserver(self, vserver, security_services=None,
needs_lock=True):
"""Delete a Vserver plus IPspace and security services as needed."""
ipspace_name = self._client.get_vserver_ipspace(vserver)
@ -378,8 +382,7 @@ class NetAppCmodeMultiSVMFileStorageLibrary(
else:
vlan_id = None
@utils.synchronized('netapp-VLAN-%s' % vlan_id, external=True)
def _delete_vserver_with_lock():
def _delete_vserver_without_lock():
self._client.delete_vserver(vserver,
vserver_client,
security_services=security_services)
@ -390,7 +393,14 @@ class NetAppCmodeMultiSVMFileStorageLibrary(
self._delete_vserver_vlans(interfaces_on_vlans)
return _delete_vserver_with_lock()
@utils.synchronized('netapp-VLAN-%s' % vlan_id, external=True)
def _delete_vserver_with_lock():
_delete_vserver_without_lock()
if needs_lock:
return _delete_vserver_with_lock()
else:
return _delete_vserver_without_lock()
@na_utils.trace
def _delete_vserver_vlans(self, network_interfaces_on_vlans):

1
manila/tests/share/drivers/netapp/dataontap/cluster_mode/test_lib_multi_svm.py
View File

@ -522,6 +522,7 @@ class NetAppFileStorageLibraryTestCase(test.TestCase):
fake.IPSPACE)
self.library._delete_vserver.assert_called_once_with(
vserver_name,
needs_lock=False,
security_services=None)
self.assertFalse(vserver_client.enable_nfs.called)
self.assertEqual(1, lib_multi_svm.LOG.error.call_count)

5
releasenotes/notes/bug-1831092-netapp-fix-race-condition-524555133aaa6ca8.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixed an issue with the NetApp driver failing during a rollback operation
in the share server creation.