diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-04 22:39:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-04 22:39:11 +0000 |
| commit | 69b8ec2e9cf48ee836f968ea0817e1d2955b3e63 (patch) | |
| tree | 7cdcae49bd770d831e33a6f75024854feff0ae48 /nova/compute | |
| parent | 8fe279661b0c554b19fbfd145fe266ec58cad4fa (diff) | |
| parent | 10daa81057b2cfc0a3e21624b50b0b5d610b4db2 (diff) | |
Merge "Move block_device_mapping destroy operations to conductor"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index d472418f3..564b2aa02 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1058,8 +1058,7 @@ class ComputeManager(manager.SchedulerDependentManager): instance_uuid) # ensure block device mappings are not leaked - for bdm in bdms: - self.db.block_device_mapping_destroy(context, bdm['id']) + self.conductor_api.block_device_mapping_destroy(context, bdms) self._notify_about_instance_usage(context, instance, "delete.end", system_metadata=system_meta) @@ -2323,8 +2322,9 @@ class ComputeManager(manager.SchedulerDependentManager): mountpoint, instance) except Exception: with excutils.save_and_reraise_exception(): - self.db.block_device_mapping_destroy_by_instance_and_device( - context, instance.get('uuid'), mountpoint) + capi = self.conductor_api + capi.block_device_mapping_destroy_by_instance_and_device( + context, instance, mountpoint) def _attach_volume(self, context, volume_id, mountpoint, instance): volume = self.volume_api.get(context, volume_id) @@ -2435,8 +2435,8 @@ class ComputeManager(manager.SchedulerDependentManager): connector = self.driver.get_volume_connector(instance) self.volume_api.terminate_connection(context, volume, connector) self.volume_api.detach(context.elevated(), volume) - self.db.block_device_mapping_destroy_by_instance_and_volume( - context, instance['uuid'], volume_id) + self.conductor_api.block_device_mapping_destroy_by_instance_and_volume( + context, instance, volume_id) @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id()) def remove_volume_connection(self, context, volume_id, instance): |