diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-03-08 12:53:44 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-03-12 00:14:50 -0700 |
| commit | 33def9e714fbd13a6dc4b755ade4841c971f7ae5 (patch) | |
| tree | 924e88e900a73855ffc8df5330c32f6ba9092462 /nova/compute | |
| parent | 4a144270c82949189ff43028a55272e92dc2839d (diff) | |
Fix live-migration in multi_host network
* call teardown after live migration
* call update a second time after migration for dhcp
* moves the instance state update into post_live_migrate
* completes the fix for bug 939060
* fixes bug 947326
Change-Id: I042567573b9bb46381c5447aa08e83cd1916b225
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 6572c5a3a..889e9e5f0 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2000,10 +2000,6 @@ class ComputeManager(manager.SchedulerDependentManager): # Releasing vlan. # (not necessary in current implementation?) - # NOTE(tr3buchet): tear down networks on source host - self.network_api.setup_networks_on_host(ctxt, instance_ref, - self.host, teardown=True) - network_info = self._get_instance_nw_info(ctxt, instance_ref) # Releasing security group ingress rule. self.driver.unfilter_instance(instance_ref, @@ -2041,15 +2037,6 @@ class ComputeManager(manager.SchedulerDependentManager): "args": {'instance_id': instance_ref['id'], 'block_migration': block_migration}}) - # Restore instance state - current_power_state = self._get_power_state(ctxt, instance_ref) - self._instance_update(ctxt, - instance_ref["id"], - host=dest, - power_state=current_power_state, - vm_state=vm_states.ACTIVE, - task_state=None) - # Restore volume state for volume_ref in instance_ref['volumes']: self.volume_api.update(ctxt, volume_ref, {'status': 'in-use'}) @@ -2067,6 +2054,10 @@ class ComputeManager(manager.SchedulerDependentManager): self.driver.unplug_vifs(instance_ref, self._legacy_nw_info(network_info)) + # NOTE(tr3buchet): tear down networks on source host + self.network_api.setup_networks_on_host(ctxt, instance_ref, + self.host, teardown=True) + LOG.info(_('Migrating instance to %(dest)s finished successfully.'), locals(), instance=instance_ref) LOG.info(_("You may see the error \"libvirt: QEMU error: " @@ -2098,6 +2089,19 @@ class ComputeManager(manager.SchedulerDependentManager): self.driver.post_live_migration_at_destination(context, instance_ref, self._legacy_nw_info(network_info), block_migration) + # Restore instance state + current_power_state = self._get_power_state(context, instance_ref) + self._instance_update(context, + instance_ref['id'], + host=self.host, + power_state=current_power_state, + vm_state=vm_states.ACTIVE, + task_state=None) + + # NOTE(vish): this is necessary to update dhcp + self.network_api.setup_networks_on_host(context, + instance_ref, + self.host) def rollback_live_migration(self, context, instance_ref, dest, block_migration): |