openstack/placement
Code Issues Proposed changes

Merge "Add error as not-in-progress migration status"

Browse Source
This commit is contained in:
Jenkins
2014-01-27 05:09:14 +00:00
committed by Gerrit Code Review
parent 0a9c280a54 a4c3bc79ee
commit 25b2ede2fa
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/db/sqlalchemy/api.py
View File

@@ -4066,7 +4066,8 @@ def migration_get_in_progress_by_host_and_node(context, host, node):
models.Migration.source_node == node), models.Migration.source_node == 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_(['confirmed', 'reverted'])).\ filter(~models.Migration.status.in_(['confirmed', 'reverted',
'error'])).\
options(joinedload_all('instance.system_metadata')).\ options(joinedload_all('instance.system_metadata')).\
all() all()