summaryrefslogtreecommitdiff
path: root/nova/compute
diff options
context:
space:
mode:
authorAmit Uniyal <auniyal@redhat.com>2022-07-06 18:20:02 +0000
committerAmit Uniyal <auniyal@redhat.com>2022-08-03 04:52:10 +0000
commitdb919aa15f24c0d74f3c5c0e8341fad3f2392e57 (patch)
treed1d0e5871f927a1c249ba62f37b04b5f6d0f20aa /nova/compute
parent5904c7f993ac737d68456fc05adf0aaa7a6f3018 (diff)
downloadnova-db919aa15f24c0d74f3c5c0e8341fad3f2392e57.tar.gz
For evacuation, ignore if task_state is not None
ignore instance task state and continue with vm evacutaion Closes-Bug: #1978983 Change-Id: I5540df6c7497956219c06cff6f15b51c2c8bc29d
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 8170fd8f24..3ec0a5267c 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -5476,7 +5476,7 @@ class API:
@reject_vtpm_instances(instance_actions.EVACUATE)
@block_accelerators(until_service=SUPPORT_ACCELERATOR_SERVICE_FOR_REBUILD)
@check_instance_state(vm_state=[vm_states.ACTIVE, vm_states.STOPPED,
- vm_states.ERROR])
+ vm_states.ERROR], task_state=None)
def evacuate(self, context, instance, host, on_shared_storage,
admin_password=None, force=None):
"""Running evacuate to target host.
@@ -5503,7 +5503,7 @@ class API:
context, instance.uuid)
instance.task_state = task_states.REBUILDING
- instance.save(expected_task_state=[None])
+ instance.save(expected_task_state=None)
self._record_action_start(context, instance, instance_actions.EVACUATE)
# NOTE(danms): Create this as a tombstone for the source compute