openstack/nova
Code Issues Proposed changes

Merge "Add error as not-in-progress migration status"

Browse Source
This commit is contained in:
Jenkins
2014-01-27 05:09:14 +00:00
committed by Gerrit Code Review
parent aa833a9843 16dfff5ded
commit 152a2b55c3
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4066,7 +4066,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'])).\
filter(~models.Migration.status.in_(['confirmed', 'reverted',
'error'])).\
options(joinedload_all('instance.system_metadata')).\
all()

2
nova/tests/compute/test_resource_tracker.py
View File

@@ -447,7 +447,7 @@ class BaseTrackerTestCase(BaseTestCase):
def _fake_migration_get_in_progress_by_host_and_node(self, ctxt, host,
node):
status = ['confirmed', 'reverted']
status = ['confirmed', 'reverted', 'error']
migrations = []
for migration in self._migrations.values():

2
nova/tests/db/test_db_api.py
View File

@@ -738,6 +738,7 @@ class MigrationTestCase(test.TestCase):
self._create()
self._create(status='reverted')
self._create(status='confirmed')
self._create(status='error')
self._create(source_compute='host2', source_node='b',
dest_compute='host1', dest_node='a')
self._create(source_compute='host2', dest_compute='host3')
@@ -762,6 +763,7 @@ class MigrationTestCase(test.TestCase):
for migration in migrations:
self.assertNotEqual('confirmed', migration['status'])
self.assertNotEqual('reverted', migration['status'])
self.assertNotEqual('error', migration['status'])
def test_migration_get_in_progress_joins(self):
self._create(source_compute='foo', system_metadata={'foo': 'bar'})