openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

clone: Fix --preserve-data --file /existing/storage/vol 

We were validating storage creation in a bunch of cases where we
shouldn't, since it was all skipped anyways.
This commit is contained in:
Cole Robinson 2013-04-24 10:47:56 -04:00
parent 978140b065
commit 6f4167a66f
2 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/clitest.py
View File

@ -746,6 +746,7 @@ vclon.add_valid("misc", "-o test --auto-clone") # Auto flag, no storage
vclon.add_valid("misc", "--original-xml %(CLONE_DISK_XML)s --auto-clone") # Auto flag w/ storage,
vclon.add_valid("misc", "--original-xml %(CLONE_STORAGE_XML)s --auto-clone") # Auto flag w/ managed storage,
vclon.add_valid("misc", "-o test-for-clone --auto-clone --clone-running") # Auto flag, actual VM, skip state check
vclon.add_valid("misc", "-o test-clone-simple -n newvm --preserve-data --file /default-pool/default-vol --clone-running --force") # Preserve data shouldn't complain about existing volume
vclon.add_invalid("misc", "--auto-clone# Auto flag, actual VM, without state skip ") # Just the auto flag
vclon.add_invalid("misc", "-o test-for-clone --auto-clone")

87
virtinst/CloneManager.py
View File

@ -425,6 +425,53 @@ class CloneDesign(object):
raise RuntimeError(_("Domain with devices to clone must be "
"paused or shutoff."))
def _setup_disk_clone_destination(self, orig_disk, clone_disk):
"""
Helper that validates the new path location
"""
if self.preserve_dest_disks:
return
if clone_disk.vol_object:
# XXX We could always do this with vol upload?
# Special case: non remote cloning of a guest using
# managed block devices: fall back to local cloning if
# we have permissions to do so. This validation check
# caused a few bug reports in a short period of time,
# so must be a common case.
if (clone_disk.is_remote() or
clone_disk.type != clone_disk.TYPE_BLOCK or
not orig_disk.path or
not os.access(orig_disk.path, os.R_OK) or
not clone_disk.path or
not os.access(clone_disk.path, os.W_OK)):
raise RuntimeError(
_("Clone onto existing storage volume is not "
"currently supported: '%s'") % clone_disk.path)
# Sync 'size' between the two
if orig_disk.size:
clone_disk.size = orig_disk.size
# Setup proper cloning inputs for the new virtual disks
if orig_disk.vol_object and clone_disk.vol_install:
# Source and dest are managed. If they share the same pool,
# replace vol_install with a CloneVolume instance, otherwise
# simply set input_vol on the dest vol_install
if (clone_disk.vol_install.pool.name() ==
orig_disk.vol_object.storagePoolLookupByVolume().name()):
newname = clone_disk.vol_install.name
clone_disk.vol_install = Storage.CloneVolume(newname,
orig_disk.vol_object)
else:
clone_disk.vol_install.input_vol = orig_disk.vol_object
else:
clone_disk.clone_path = orig_disk.path
def setup_clone(self):
"""
@ -476,45 +523,7 @@ class CloneDesign(object):
if disk.target == orig_disk.target:
xmldisk = disk
if clone_disk.vol_object:
# XXX We could always do this with vol upload?
# Special case: non remote cloning of a guest using
# managed block devices: fall back to local cloning if
# we have permissions to do so. This validation check
# caused a few bug reports in a short period of time,
# so must be a common case.
if (clone_disk.is_remote() or
clone_disk.type != clone_disk.TYPE_BLOCK or
not orig_disk.path or
not os.access(orig_disk.path, os.R_OK) or
not clone_disk.path or
not os.access(clone_disk.path, os.W_OK)):
raise RuntimeError(
_("Clone onto existing storage volume is not "
"currently supported: '%s'") % clone_disk.path)
# Sync 'size' between the two
if orig_disk.size:
clone_disk.size = orig_disk.size
# Setup proper cloning inputs for the new virtual disks
if orig_disk.vol_object and clone_disk.vol_install:
# Source and dest are managed. If they share the same pool,
# replace vol_install with a CloneVolume instance, otherwise
# simply set input_vol on the dest vol_install
if (clone_disk.vol_install.pool.name() ==
orig_disk.vol_object.storagePoolLookupByVolume().name()):
newname = clone_disk.vol_install.name
clone_disk.vol_install = Storage.CloneVolume(newname,
orig_disk.vol_object)
else:
clone_disk.vol_install.input_vol = orig_disk.vol_object
elif not self.preserve_dest_disks:
clone_disk.clone_path = orig_disk.path
self._setup_disk_clone_destination(orig_disk, clone_disk)
# Change the XML
xmldisk.path = None