openstack
/
nova
Code Issues Proposed changes

Merge "VMware: trivial fix for comment"

This commit is contained in:
Jenkins 2014-11-12 16:31:47 +00:00 committed by Gerrit Code Review
parent 70ad74c778 12d8258c6a
commit 6f83d3838d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/virt/vmwareapi/vmops.py
View File

@ -841,10 +841,11 @@ class VMwareVMOps(object):
# triggered by the revert resize api call. This prevents
# the uuid-orig VM to be deleted to be able to associate it later.
if instance.task_state != task_states.RESIZE_REVERTING:
# When VM deletion is triggered in middle of VM resize before VM
# arrive RESIZED state, uuid-orig VM need to deleted to avoid
# VM leak. Within method _destroy_instance it will check vmref
# exist or not before attempt deletion.
# When a VM deletion is triggered in the middle of VM resize and
# before the state is set to RESIZED, the uuid-orig VM needs
# to be deleted. This will avoid VM leaks.
# The method _destroy_instance will check that the vmref
# exists before attempting the deletion.
resize_orig_vmname = instance.uuid + self._migrate_suffix
vm_orig_ref = vm_util.get_vm_ref_from_name(self._session,
resize_orig_vmname)