openstack
/
manila
Code Issues Proposed changes

Merge "early return for _share_replica_update() if there is no active replica" into stable/ussuri

This commit is contained in:
Zuul 2022-05-05 16:05:57 +00:00 committed by Gerrit Code Review
parent 54cd7315da fab69a13f5
commit b40b580059
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manila/share/manager.py
View File

@ -2370,9 +2370,22 @@ class ShareManager(manager.SchedulerDependentManager):
with_share_data=True, with_share_server=True)
)
_active_replica = [x for x in replica_list
if x['replica_state'] ==
constants.REPLICA_STATE_ACTIVE][0]
_active_replica = next((x for x in replica_list
if x['replica_state'] ==
constants.REPLICA_STATE_ACTIVE), None)
if _active_replica is None:
if share_replica['replica_state'] != constants.STATUS_ERROR:
# only log warning if replica_state was not already in error
msg = (("Replica parent share %(id)s has no active "
"replica.") % {'id': share_replica['share_id']})
LOG.warning(msg)
self.db.share_replica_update(context, share_replica['id'],
{'replica_state':
constants.STATUS_ERROR})
# without a related active replica, we cannot act on any
# non-active replica
return
# Get snapshots for the share.
share_snapshots = self.db.share_snapshot_get_all_for_share(