openstack
/
trove
Code Issues Proposed changes

Merge "Fix race condition in cluster-show"

This commit is contained in:
Jenkins 2016-11-18 21:29:37 +00:00 committed by Gerrit Code Review
parent 681a9830e0 1b114c8735
commit da9d3d3672
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
releasenotes/notes/fix-cluster-show-346798b3e3.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Fix race condition in cluster-show that returned
erroneous not found error.
Bug 1643002

15
trove/instance/models.py
View File

@ -1423,9 +1423,18 @@ class Instances(object):
def load_all_by_cluster_id(context, cluster_id, load_servers=True):
db_instances = DBInstance.find_all(cluster_id=cluster_id,
deleted=False)
return [load_any_instance(context, db_inst.id,
load_server=load_servers)
for db_inst in db_instances]
db_insts = []
for db_instance in db_instances:
try:
db_inst = load_any_instance(
context, db_instance.id, load_server=load_servers)
db_insts.append(db_inst)
except exception.NotFound:
# The instance may be gone if we're in the middle of a
# shrink operation, so just log and continue
LOG.debug("Instance %s is no longer available, skipping." %
db_instance.id)
return db_insts
@staticmethod
def _load_servers_status(load_instance, context, db_items, find_server):