1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-11-11 12:46:49 +00:00

feat(instances): a VM's destruction says what goes, and keeps what a kept file needs

The Destroy tab was a sub-tab with one sentence and a link; its
confirmation page said only "This action is irreversible!" over a
"Remove Instance's data" switch. The tab now shows the state and
"Review destruction". The owner chose the confirmation layout from
three rendered options: the VM and its host, that its definition,
saved state and snapshot records go and that a running VM is forced
off, two plans for the files (delete the disk files, or keep them), the
VM's disks, what is always kept, the NVRAM choice, and Cancel.

Codex reviewed destroying; this is fixed:

- A disk file that cannot be deleted keeps the files below it, which
  it needs: they were deleted after it, leaving it broken. The files
  are deleted overlays first (split_disk_paths_by_use orders them by
  how many files each grows from), and if the files a kept one needs
  cannot be read, none of the rest goes. A message names each file
  kept so, and a failed deletion says the VM is removed.
This commit is contained in:
catborise 2026-10-30 22:19:31 +03:00
parent 7fc55537e5
commit b72e9b1442
7 changed files with 128 additions and 61 deletions

View file

@ -1705,10 +1705,18 @@ class wvmInstance(wvmConnect):
used_elsewhere = self.paths_used_by_other_domains(own)
# a kept file keeps the files below it
for path in [path for path in own if path in used_elsewhere]:
while (path := self._backing_path(path)) and path not in used_elsewhere:
while (path := self.backing_path(path)) and path not in used_elsewhere:
used_elsewhere.add(path)
def below(path):
"""How many files the path grows from: an overlay is deleted before
the files it needs, so one that cannot be deleted keeps them."""
seen = set()
while (path := self.backing_path(path)) and path not in seen:
seen.add(path)
return len(seen)
return (
[path for path in own if path not in used_elsewhere],
sorted((path for path in own if path not in used_elsewhere), key=below, reverse=True),
[path for path in own if path in used_elsewhere],
)
@ -1739,7 +1747,7 @@ class wvmInstance(wvmConnect):
points.update(self._disk_sources(saved).values())
files = list(tops)
for path in tops:
while (path := self._backing_path(path)) in points and path not in files:
while (path := self.backing_path(path)) in points and path not in files:
files.append(path)
grew = True
while grew:
@ -1748,14 +1756,14 @@ class wvmInstance(wvmConnect):
if top in files: # reached by a branch in this pass
continue
branch, path = [top], top
while (path := self._backing_path(path)) in points | overlays and path not in files:
while (path := self.backing_path(path)) in points | overlays and path not in files:
branch.append(path)
if path in files:
files += branch
grew = True
return files[len(tops):] + memory
def _backing_path(self, path):
def backing_path(self, path):
"""The backing file of a volume; None if it has none or is in no pool.
Any other error is raised: a chain cut short would let a file a kept
one needs count as deletable."""
@ -2026,7 +2034,7 @@ class wvmInstance(wvmConnect):
# do not keep each other, but a file in use keeps the files below it
in_use = self.paths_in_use(own=left)
for path in [path for path in left if path in in_use]:
while (path := self._backing_path(path)) and path not in in_use:
while (path := self.backing_path(path)) and path not in in_use:
in_use.add(path)
left = [path for path in left if path not in in_use]
return left

View file

@ -91,6 +91,7 @@ class DeleteWithDisksTestCase(unittest.TestCase):
vm.get_disk_devices = lambda: [{"path": "/pool/web-1.qcow2"}]
vm._snapshot_chain_files = lambda own: []
vm.paths_used_by_other_domains = lambda own: set()
vm.backing_path = lambda path: None
pool = MagicMock()
if seed_in_pool:
pool.storageVolLookupByName.return_value.path.return_value = f"/pool/cidata-{UUID}.iso"

View file

@ -611,7 +611,7 @@ class LeftBehindTestCase(unittest.TestCase):
def test_a_file_another_vm_uses_is_not_reported(self):
# on NFS libvirt could not remove it, but another VM uses it now
with patch.object(wvmInstance, "paths_in_use", return_value={"/pool/a.one"}) as in_use, \
patch.object(wvmInstance, "_backing_path", return_value=None):
patch.object(wvmInstance, "backing_path", return_value=None):
left = self.run_delete({"/pool/a.one", "/pool/vm.one.mem", "/pool/a.two", "/pool/a.qcow2"})
self.assertEqual(left, ["/pool/vm.one.mem"])
# their own backing files do not keep each other
@ -622,7 +622,7 @@ class LeftBehindTestCase(unittest.TestCase):
# file, and the in-use top's own backing reference does not count
backing = {"/pool/a.one": "/pool/vm.one.mem"}
with patch.object(wvmInstance, "paths_in_use", return_value={"/pool/a.one"}), \
patch.object(wvmInstance, "_backing_path", side_effect=backing.get):
patch.object(wvmInstance, "backing_path", side_effect=backing.get):
left = self.run_delete({"/pool/a.one", "/pool/vm.one.mem", "/pool/a.two", "/pool/a.qcow2"})
self.assertEqual(left, [])
@ -774,6 +774,9 @@ class DestroyFilesTestCase(unittest.TestCase):
backing[top] = "/pool/a.one"
if extra:
backing[extra[0]] = extra[1]
# the template's own chain, longer than the VM's files
template = ["/templates/base.qcow2"] + [f"/templates/base{n}.qcow2" for n in range(1, 10)]
backing.update(zip(template, template[1:]))
if other_overlay_on:
backing["/pool/other.qcow2"] = other_overlay_on
@ -798,10 +801,10 @@ class DestroyFilesTestCase(unittest.TestCase):
missing = libvirtError("no volume")
missing.err = (libvirt.VIR_ERR_NO_STORAGE_VOL,)
p.get_volume_by_path = MagicMock(side_effect=missing)
self.assertIsNone(p._backing_path("/elsewhere/base.qcow2")) # in no pool
self.assertIsNone(p.backing_path("/elsewhere/base.qcow2")) # in no pool
p.get_volume_by_path = MagicMock(side_effect=libvirtError("connection lost"))
with self.assertRaises(libvirtError):
p._backing_path("/pool/a.one")
p.backing_path("/pool/a.one")
def test_the_snapshot_chain_and_memory_go_but_not_the_template(self):
delete, keep = self.split()
@ -822,6 +825,13 @@ class DestroyFilesTestCase(unittest.TestCase):
)
self.assertEqual(keep, [])
def test_an_overlay_is_deleted_before_the_files_it_needs(self):
# after a revert the branch a.two comes before a.one: if it cannot be deleted, a.one is still there
delete, _ = self.split(top="/pool/a.reverted")
for overlay, below in (("/pool/a.two", "/pool/a.one"), ("/pool/a.reverted", "/pool/a.one"),
("/pool/a.one", "/pool/a.qcow2")):
self.assertLess(delete.index(overlay), delete.index(below), (overlay, below))
def test_a_snapshot_file_off_the_disks_chain_stays(self):
# a disk detached since: its snapshot overlay grows from a file the
# VM's disks do not