openstack/nova
Code Issues Proposed changes

Merge "Stop filtering out 'accepted' for in-progress migrations"

Browse Source
This commit is contained in:
Zuul 2019-09-28 07:24:00 +00:00 committed by Gerrit Code Review
commit 961c294549
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4419,10 +4419,10 @@ 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_(['accepted', 'confirmed',
'reverted', 'error',
'failed', 'completed',
'cancelled', 'done'])).\
filter(~models.Migration.status.in_(['confirmed', 'reverted',
'error', 'failed',
'completed', 'cancelled',
'done'])).\
options(_joinedload_all('instance.system_metadata')).\
all()

5
nova/tests/unit/db/test_db_api.py
View File

@ -1153,7 +1153,6 @@ class MigrationTestCase(test.TestCase):
self.assertNotEqual('reverted', migration['status'])
self.assertNotEqual('error', migration['status'])
self.assertNotEqual('failed', migration['status'])
self.assertNotEqual('accepted', migration['status'])
self.assertNotEqual('done', migration['status'])
self.assertNotEqual('cancelled', migration['status'])
@ -1169,7 +1168,7 @@ class MigrationTestCase(test.TestCase):
migrations = db.migration_get_in_progress_by_host_and_node(self.ctxt,
'host1', 'a')
# 2 as source + 1 as dest
self.assertEqual(3, len(migrations))
self.assertEqual(4, len(migrations))
self._assert_in_progress(migrations)
def test_in_progress_host1_nodeb(self):
@ -1182,7 +1181,7 @@ class MigrationTestCase(test.TestCase):
migrations = db.migration_get_in_progress_by_host_and_node(self.ctxt,
'host2', 'b')
# 2 as dest, 1 as source
self.assertEqual(3, len(migrations))
self.assertEqual(4, len(migrations))
self._assert_in_progress(migrations)
def test_instance_join(self):