openstack/nova
Code Issues Proposed changes

Merge "Fix bug #917615"

Browse Source
This commit is contained in:
Jenkins 2012-01-19 07:18:28 +00:00 committed by Gerrit Code Review
commit 62cf8872a7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/manager.py
View File

@ -1985,7 +1985,7 @@ class ComputeManager(manager.SchedulerDependentManager):
block_device_info = \ block_device_info = \
self._get_instance_volume_block_device_info(context, instance_id) self._get_instance_volume_block_device_info(context, instance_id)
self.driver.destroy(instance_ref, network_info, self.driver.destroy(instance_ref, network_info,
block_device_info, True) block_device_info)
@manager.periodic_task @manager.periodic_task
def _poll_rebooting_instances(self, context): def _poll_rebooting_instances(self, context):

2
nova/virt/libvirt/connection.py
View File

@ -1714,8 +1714,8 @@ class LibvirtConnection(driver.ComputeDriver):
FLAGS.live_migration_bandwidth) FLAGS.live_migration_bandwidth)
except Exception: except Exception:
with utils.save_and_reraise_exception():
recover_method(ctxt, instance_ref, dest, block_migration) recover_method(ctxt, instance_ref, dest, block_migration)
raise
# Waiting for completion of live_migration. # Waiting for completion of live_migration.
timer = utils.LoopingCall(f=None) timer = utils.LoopingCall(f=None)