From e9e638116d44abe2b316b421ba7532f0861bca10 Mon Sep 17 00:00:00 2001
From: Ludovic Beliveau <ludovic.beliveau@windriver.com>
Date: Mon, 8 Feb 2016 10:36:30 -0500
Subject: [PATCH] Failed migration shoudn't be reported as in progress

This fix add 'failed' status to the list of filters for migrations that are
reported by migration_get_in_progress_by_host_and_node.

Change-Id: I7de143d73a84339d2184d09e5907cbbe941a2e66
Closes-Bug: #1543123
---
 nova/db/sqlalchemy/api.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 81d307b10..f1b27ff28 100644
--- 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()