Skip to content
This repository has been archived by the owner on Nov 9, 2020. It is now read-only.

vmdk_ops.cloneVMDK: Fix source volume lockname #771

Merged
merged 1 commit into from
Nov 28, 2016
Merged

vmdk_ops.cloneVMDK: Fix source volume lockname #771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions esx_service/vmdk_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,11 @@ def cloneVMDK(vm_name, vmdk_path, opts={}, vm_uuid=None, vm_datastore=None):
if not os.path.isfile(src_vmdk_path):
return err("Could not find volume for cloning %s" % opts[kv.CLONE_FROM])

with lockManager.get_lock(src_volume):
# Form datastore path from vmdk_path
dest_vol = vmdk_utils.get_datastore_path(vmdk_path)
source_vol = vmdk_utils.get_datastore_path(src_vmdk_path)

with lockManager.get_lock(source_vol):
# Verify if the source volume is in use.
attached, uuid, attach_as = getStatusAttached(src_vmdk_path)
if attached:
Expand All @@ -289,10 +293,7 @@ def cloneVMDK(vm_name, vmdk_path, opts={}, vm_uuid=None, vm_datastore=None):
vdisk_spec.adapterType = 'busLogic'
vdisk_spec.diskType = disk_format

# Form datastore path from vmdk_path
dest_vol = vmdk_utils.get_datastore_path(vmdk_path)
source_vol = vmdk_utils.get_datastore_path(src_vmdk_path)

# Clone volume
si = get_si()
task = si.content.virtualDiskManager.CopyVirtualDisk(
sourceName=source_vol, destName=dest_vol, destSpec=vdisk_spec)
Expand Down