diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-21 19:23:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-21 19:23:46 +0000 |
| commit | cc2d8fc5a874df1a28dc87c7b7ed8e2d1117566e (patch) | |
| tree | 9d05caa6c6a803387197516e604fcc9618a8d5db | |
| parent | 03dcc98a659f8e778eb9641de7da866824c06461 (diff) | |
| parent | 683d13604103102112565fe5f93f064c5e4cb1f7 (diff) | |
| download | nova-cc2d8fc5a874df1a28dc87c7b7ed8e2d1117566e.tar.gz nova-cc2d8fc5a874df1a28dc87c7b7ed8e2d1117566e.tar.xz nova-cc2d8fc5a874df1a28dc87c7b7ed8e2d1117566e.zip | |
Merge "Fix live migration when volumes are attached"
| -rw-r--r-- | nova/compute/manager.py | 8 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 3 |
2 files changed, 0 insertions, 11 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 76c91a575..8ef673328 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2148,14 +2148,6 @@ class ComputeManager(manager.SchedulerDependentManager): """ try: - # Checking volume node is working correctly when any volumes - # are attached to instances. - if self._get_instance_volume_bdms(context, instance['uuid']): - rpc.call(context, - FLAGS.volume_topic, - {'method': 'check_for_export', - 'args': {'instance_id': instance['id']}}) - if block_migration: disk = self.driver.get_instance_disk_info(instance['name']) else: diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 747774fa4..0a56a9b9e 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -2090,9 +2090,6 @@ class ComputeTestCase(BaseTestCase): # creating mocks self.mox.StubOutWithMock(rpc, 'call') - rpc.call(c, FLAGS.volume_topic, - {"method": "check_for_export", - "args": {'instance_id': inst_id}}) self.mox.StubOutWithMock(self.compute.driver, 'get_instance_disk_info') |