diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-12 16:02:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-12 16:02:20 +0000 |
| commit | afce58ac2ec124be91f4e41e990fd727bc838c57 (patch) | |
| tree | 69e9ead5519ffa099c892bf26411f91537d02aee | |
| parent | 83f12559fd45d0bae4a76b01f98475a6cff66a11 (diff) | |
| parent | fa3fb5e61f1648bc94b426451136da763b1cc73f (diff) | |
| download | nova-afce58ac2ec124be91f4e41e990fd727bc838c57.tar.gz | |
Merge "Don't track migrations in 'accepted' state" into stable/liberty
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 4 | ||||
| -rw-r--r-- | nova/tests/unit/db/test_db_api.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 75b2da261b..53451b7ebe 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -4482,8 +4482,8 @@ def migration_get_in_progress_by_host_and_node(context, host, node): models.Migration.source_node == node), and_(models.Migration.dest_compute == host, models.Migration.dest_node == node))).\ - filter(~models.Migration.status.in_(['confirmed', 'reverted', - 'error'])).\ + filter(~models.Migration.status.in_(['accepted', 'confirmed', + 'reverted', 'error'])).\ 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 d608bf5d9e..1ec80012b7 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='accepted') self._create(source_compute='host2', source_node='b', dest_compute='host1', dest_node='a') self._create(source_compute='host2', dest_compute='host3') @@ -1276,6 +1277,7 @@ class MigrationTestCase(test.TestCase): self.assertNotEqual('confirmed', migration['status']) self.assertNotEqual('reverted', migration['status']) self.assertNotEqual('error', migration['status']) + self.assertNotEqual('accepted', migration['status']) def test_migration_get_in_progress_joins(self): self._create(source_compute='foo', system_metadata={'foo': 'bar'}) |