diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-12 16:03:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-12 16:03:16 +0000 |
| commit | 61896dbf7f697cde319372254fe57ba39fc3c02e (patch) | |
| tree | dcba00087ffdd06418681ac477375ba4c4a8ad2f | |
| parent | afce58ac2ec124be91f4e41e990fd727bc838c57 (diff) | |
| parent | 3bc45979f146280fbd1ce722b3ffcb99f33d3761 (diff) | |
| download | nova-61896dbf7f697cde319372254fe57ba39fc3c02e.tar.gz | |
Merge "Failed migration shoudn't be reported as in progress" into stable/liberty
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 3 | ||||
| -rw-r--r-- | nova/tests/unit/db/test_db_api.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 53451b7ebe..bee083ef86 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -4483,7 +4483,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() diff --git a/nova/tests/unit/db/test_db_api.py b/nova/tests/unit/db/test_db_api.py index 1ec80012b7..8df2b91a3c 100644 --- a/nova/tests/unit/db/test_db_api.py +++ b/nova/tests/unit/db/test_db_api.py @@ -1250,6 +1250,7 @@ class MigrationTestCase(test.TestCase): self._create(status='reverted') self._create(status='confirmed') self._create(status='error') + self._create(status='failed') self._create(status='accepted') self._create(source_compute='host2', source_node='b', dest_compute='host1', dest_node='a') @@ -1277,6 +1278,7 @@ class MigrationTestCase(test.TestCase): self.assertNotEqual('confirmed', migration['status']) self.assertNotEqual('reverted', migration['status']) self.assertNotEqual('error', migration['status']) + self.assertNotEqual('failed', migration['status']) self.assertNotEqual('accepted', migration['status']) def test_migration_get_in_progress_joins(self): |