Merge "compute: Take an instance.uuid lock when rebooting" into stable/rocky

This commit is contained in:
Zuul 2019-12-07 05:07:38 +00:00 committed by Gerrit Code Review
commit de00ef96a9
1 changed files with 9 additions and 0 deletions

View File

@ -3437,6 +3437,15 @@ class ComputeManager(manager.Manager):
@wrap_instance_fault @wrap_instance_fault
def reboot_instance(self, context, instance, block_device_info, def reboot_instance(self, context, instance, block_device_info,
reboot_type): reboot_type):
@utils.synchronized(instance.uuid)
def do_reboot_instance(context, instance, block_device_info,
reboot_type):
self._reboot_instance(context, instance, block_device_info,
reboot_type)
do_reboot_instance(context, instance, block_device_info, reboot_type)
def _reboot_instance(self, context, instance, block_device_info,
reboot_type):
"""Reboot an instance on this host.""" """Reboot an instance on this host."""
# acknowledge the request made it to the manager # acknowledge the request made it to the manager
if reboot_type == "SOFT": if reboot_type == "SOFT":