openstack
/
senlin
Code Issues Proposed changes

Merge "Fix engine service restart HealthRegistry update error"

This commit is contained in:
Zuul 2017-12-05 04:54:14 +00:00 committed by Gerrit Code Review
parent e7bf8ba7c6 3840391c34
commit 645b369e0a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
senlin/db/sqlalchemy/api.py
View File

@ -1530,7 +1530,7 @@ def registry_claim(context, engine_id):
with session_for_write() as session:
engines = session.query(models.Service).all()
svc_ids = [e.id for e in engines if not utils.is_service_dead(e)]
q_reg = session.query(models.HealthRegistry)
q_reg = session.query(models.HealthRegistry).with_lockmode('update')
if svc_ids:
q_reg = q_reg.filter(
models.HealthRegistry.engine_id.notin_(svc_ids))