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

2016-02-22 08:30:44 +00:00 · 2016-02-22 08:30:44 +00:00 · 3926f87ad4
commit 3926f87ad4
parent 955dabb046 e9e638116d
1 changed files with 2 additions and 1 deletions
--- a/nova/db/sqlalchemy/api.py
+++ b/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,
                            models.Migration.dest_node == node))).\
            filter(~models.Migration.status.in_(['accepted', 'confirmed',
-                                                 'reverted', 'error'])).\
+                                                 'reverted', 'error',
+                                                 'failed'])).\
            options(joinedload_all('instance.system_metadata')).\
            all()