openstack/placement
Code Issues Proposed changes

Merge "Failed migration shoudn't be reported as in progress"

Browse Source
This commit is contained in:
Jenkins 2016-02-22 08:30:44 +00:00 committed by Gerrit Code Review
commit 3926f87ad4
1 changed files with 2 additions and 1 deletions

3
nova/db/sqlalchemy/api.py

@ -4540,7 +4540,8 @@ def migration_get_in_progress_by_host_and_node(context, host, node):
and_(models.Migration.dest_compute == host, and_(models.Migration.dest_compute == host,
models.Migration.dest_node == node))).\ models.Migration.dest_node == node))).\
filter(~models.Migration.status.in_(['accepted', 'confirmed', filter(~models.Migration.status.in_(['accepted', 'confirmed',
'reverted', 'error'])).\ 'reverted', 'error',
'failed'])).\
options(joinedload_all('instance.system_metadata')).\ options(joinedload_all('instance.system_metadata')).\
all() all()