Merge "Lock detach_volume"

This commit is contained in:
Zuul 2019-02-14 21:46:52 +00:00 committed by Gerrit Code Review
commit a4e6340bdc
1 changed files with 8 additions and 4 deletions

View File

@ -5633,10 +5633,14 @@ class ComputeManager(manager.Manager):
and volume.
"""
bdm = objects.BlockDeviceMapping.get_by_volume_and_instance(
context, volume_id, instance.uuid)
self._detach_volume(context, bdm, instance,
attachment_id=attachment_id)
@utils.synchronized(instance.uuid)
def do_detach_volume(context, volume_id, instance, attachment_id):
bdm = objects.BlockDeviceMapping.get_by_volume_and_instance(
context, volume_id, instance.uuid)
self._detach_volume(context, bdm, instance,
attachment_id=attachment_id)
do_detach_volume(context, volume_id, instance, attachment_id)
def _init_volume_connection(self, context, new_volume,
old_volume_id, connector, bdm,