Skip to content

[Unity]: Delete fs with retry when deleting share #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yong-huang wants to merge 1 commit into
base: train-fix-lacp-port-issue
Choose a base branch
from
Open

[Unity]: Delete fs with retry when deleting share #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions manila/share/drivers/dell_emc/plugins/unity/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@
7.0.3 - Bugfix: remove enable ace process when creating cifs share
7.0.4 - Bugfix: ignore the has snaps error when deleting filesystem
7.0.5 - Bugfix: fix the driver startup issue with LACP ports configured
7.0.6 - Bugfix: delete filesystem with retry when deleting share
"""

VERSION = "7.0.5"
VERSION = "7.0.6"

LOG = log.getLogger(__name__)
SUPPORTED_NETWORK_TYPES = (None, 'flat', 'vlan')
Expand Down Expand Up @@ -264,6 +265,12 @@ def create_share_from_snapshot(self, context, share, snapshot,

return locations

@utils.retry(storops_ex.UnityDeleteStorageResourceHasSnapError,
interval=5,
retries=6)
def _delete_fs_with_retry(self, filesystem):
self.client.delete_filesystem(filesystem)

def delete_share(self, context, share, share_server=None):
"""Delete a share."""
share_name = share['id']
Expand All @@ -284,11 +291,7 @@ def delete_share(self, context, share, share_server=None):
self.client.delete_share(backend_share)

if self._is_isolated_filesystem(filesystem):
try:
self.client.delete_filesystem(filesystem)
except storops_ex.UnityDeleteStorageResourceHasSnapError:
LOG.info("Filesystem %s has one or more snapshots, "
"ignore it.", filesystem.name)
self._delete_fs_with_retry(filesystem)

def extend_share(self, share, new_size, share_server=None):
backend_share = self.client.get_share(share['id'],
Expand Down