j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-11-08 19:26:48 +00:00
Code Issues Projects Releases Wiki Activity

fix(instances): recovery removes the UEFI variables copy of a clone that was not defined

Browse source 
A shut-off clone copies the VM's NVRAM file just before it defines the
clone; a worker that stopped between the two left the copy, unnamed by
the job, which recovery then reported as leaving nothing. The job
records the copy's path once libvirt made it, and recovery deletes that
file when the clone was not defined, in whichever pool it is.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Kk4h2TcUiaWmU5MUszYSea
This commit is contained in:
catborise 2026-11-07 23:46:49 +03:00
parent b4e5567e4a
commit ce98bc85d0
4 changed files with 71 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
vrtManager/instance.py
View file

@ -2449,11 +2449,11 @@ class wvmInstance(wvmConnect):
</target>
</volume>"""
def define_clone(self, clone_data, uuid, paths):
def define_clone(self, clone_data, uuid, paths, on_nvram=None):
"""Defines the clone with each copied disk's source set from paths
({dev: new path}) and its own copy of the VM's UEFI variables (NVRAM).
The NVRAM copy is removed if the definition fails. Returns the
clone's UUID."""
({dev: new path}) and its own copy of the VM's UEFI variables (NVRAM),
whose path on_nvram is given once made. The NVRAM copy is removed if
the definition fails. Returns the clone's UUID."""
tree, disks = self._clone_definition(clone_data, uuid)
for source, dev in disks:
source.set("file" if source.get("file") else "dev" if source.get("dev") else "name", paths[dev])
@ -2485,6 +2485,8 @@ class wvmInstance(wvmConnect):
if target.find(tag) is not None:
copy_target.append(target.find(tag))
copy = pool.createXMLFrom(etree.tostring(volume).decode(), original, 0)
if on_nvram is not None:
on_nvram(copy.path())
if nvram_source is not None:
nvram_source.set("file", copy.path())
else:
@ -2500,10 +2502,11 @@ class wvmInstance(wvmConnect):
) from err
raise
def clone_instance(self, clone_data, uuid):
"""Copy a shut-off VM, with its disks and UEFI variables (NVRAM).
Inputs are checked before anything is allocated, and on failure only
the volumes this call created are removed. Returns the clone's UUID."""
def clone_instance(self, clone_data, uuid, on_nvram=None):
"""Copy a shut-off VM, with its disks and UEFI variables (NVRAM; see
define_clone for on_nvram). Inputs are checked before anything is
allocated, and on failure only the volumes this call created are
removed. Returns the clone's UUID."""
if self.get_status() != 5:
# A running guest keeps writing while its disks are copied.
raise util.OperationError(gettext_noop("Shut the VM down before cloning it"))
@ -2551,7 +2554,7 @@ class wvmInstance(wvmConnect):
created.append(new_path)
paths[dev] = new_path
return self.define_clone(clone_data, uuid, paths)
return self.define_clone(clone_data, uuid, paths, on_nvram)
except Exception as err:
leftovers = []
for path in reversed(created):