Merge "optimize the shelve code flow"

This commit is contained in:
Zuul 2020-11-03 09:22:00 +00:00 committed by Gerrit Code Review
commit edd8fefe3f

View File

@ -6399,7 +6399,7 @@ class ComputeManager(manager.Manager):
instance.system_metadata['shelved_host'] = self.host instance.system_metadata['shelved_host'] = self.host
instance.vm_state = vm_states.SHELVED instance.vm_state = vm_states.SHELVED
instance.task_state = None instance.task_state = None
if CONF.shelved_offload_time == 0: if offload:
instance.task_state = task_states.SHELVING_OFFLOADING instance.task_state = task_states.SHELVING_OFFLOADING
instance.power_state = self._get_power_state(instance) instance.power_state = self._get_power_state(instance)
instance.save(expected_task_state=[ instance.save(expected_task_state=[