Skip to content
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

fix ensure #226

Merged
merged 2 commits into from
Nov 26, 2024
Merged

fix ensure #226

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0cd695
sapcc: continue to next share server when error raised
chuan137 Nov 25, 2024
c22b3b0
sapcc: continue to ensure next share instance on NotFound error
chuan137 Nov 25, 2024
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
18 changes: 13 additions & 5 deletions manila/share/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,8 +566,11 @@ def ensure_driver_resources(self, ctxt):
)
continue

share_instance = self.db.share_instance_get(
ctxt, share_instance['id'], with_share_data=True)
try:
share_instance = self.db.share_instance_get(
ctxt, share_instance['id'], with_share_data=True)
except exception.NotFound:
continue
share_instance_dict = self._get_share_instance_dict(
ctxt, share_instance)
update_share_instances.append(share_instance_dict)
Expand Down Expand Up @@ -3894,7 +3897,7 @@ def delete_free_share_servers(self, ctxt):
else:
msg = ("Share server %s has source share server %s."
"Skipping deletion.")
LOG.error(msg, server['id'], src_server_id)
LOG.warning(msg, server['id'], src_server_id)
continue

dest_servers = self.db.share_server_get_all_with_filters(ctxt, {
Expand All @@ -3904,10 +3907,15 @@ def delete_free_share_servers(self, ctxt):
dest_server_id = dest_servers[0]['id']
msg = ("Share server %s has existing destination share "
"servers %s. Skipping deletion.")
LOG.error(msg, server['id'], dest_server_id)
LOG.warning(msg, server['id'], dest_server_id)
continue

self.delete_share_server(ctxt, server)
try:
self.delete_share_server(ctxt, server)
except Exception as e:
msg = ("Error during deletion of share server %s. "
"Error: %s")
LOG.warning(msg, server['id'], e)

@add_hooks
@utils.require_driver_initialized
Expand Down