From 5a42f1fcdc93292913eab00c680c110077a8a39a Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Wed, 5 Mar 2025 11:27:07 -0500 Subject: [PATCH] Fix potential dataloss on snapshot deletion Signed-off-by: Cole Robinson --- ...lete-disk-image-only-if-parent-snaps.patch | 64 +++++++++++++++++++ libvirt.spec | 8 ++- 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 0011-qemu-snapshot-delete-disk-image-only-if-parent-snaps.patch diff --git a/0011-qemu-snapshot-delete-disk-image-only-if-parent-snaps.patch b/0011-qemu-snapshot-delete-disk-image-only-if-parent-snaps.patch new file mode 100644 index 0000000..e3cc6ee --- /dev/null +++ b/0011-qemu-snapshot-delete-disk-image-only-if-parent-snaps.patch @@ -0,0 +1,64 @@ +From d51179fa82448f4720f1645f0b7100df80508cc4 Mon Sep 17 00:00:00 2001 +From: Pavel Hrdina +Date: Thu, 9 Jan 2025 16:23:44 +0100 +Subject: [PATCH] qemu: snapshot: delete disk image only if parent snapshot is + external +Content-type: text/plain + +When we are deleting external snapshot that is not active we only need +to delete overlay disk image of the parent snapshot. This works +correctly even if parent snapshot is external and active as it will have +another overlay created when user reverted to that snapshot. + +In case the parent snapshot is internal there are no overlay disk images +created as everything is stored internally within the disk image. In +this case we would delete the actual disk image storing internal +snapshots and most likely the original disk image as well resulting in +data loss once the VM is shutoff. + +Fixes: https://gitlab.com/libvirt/libvirt/-/issues/734 +Signed-off-by: Pavel Hrdina +Reviewed-by: Peter Krempa +--- + src/qemu/qemu_snapshot.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c +index 18b2e478f6..80cd54bf33 100644 +--- a/src/qemu/qemu_snapshot.c ++++ b/src/qemu/qemu_snapshot.c +@@ -3144,6 +3144,8 @@ qemuSnapshotDeleteExternalPrepareData(virDomainObj *vm, + return -1; + } + ++ data->parentSnap = qemuSnapshotFindParentSnapForDisk(snap, data->snapDisk); ++ + if (data->merge) { + virStorageSource *snapDiskSrc = NULL; + +@@ -3185,8 +3187,6 @@ qemuSnapshotDeleteExternalPrepareData(virDomainObj *vm, + qemuSnapshotGetDisksWithBackingStore(vm, snap, data); + } + +- data->parentSnap = qemuSnapshotFindParentSnapForDisk(snap, data->snapDisk); +- + if (data->parentSnap && !virDomainSnapshotIsExternal(data->parentSnap)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("deleting external snapshot that has internal snapshot as parent not supported")); +@@ -3642,10 +3642,12 @@ qemuSnapshotDiscardExternal(virDomainObj *vm, + if (!data->job) + goto error; + } else { +- if (virStorageSourceInit(data->parentDomDisk->src) < 0 || +- virStorageSourceUnlink(data->parentDomDisk->src) < 0) { +- VIR_WARN("Failed to remove snapshot image '%s'", +- data->snapDisk->name); ++ if (data->parentSnap && virDomainSnapshotIsExternal(data->parentSnap)) { ++ if (virStorageSourceInit(data->parentDomDisk->src) < 0 || ++ virStorageSourceUnlink(data->parentDomDisk->src) < 0) { ++ VIR_WARN("Failed to remove snapshot image '%s'", ++ data->snapDisk->name); ++ } + } + } + } diff --git a/libvirt.spec b/libvirt.spec index f292510..4004f21 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -289,7 +289,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 10.6.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1 URL: https://libvirt.org/ @@ -314,6 +314,9 @@ Patch0009: 0009-network-add-tc-filter-rule-to-nftables-backend-to-fi.patch # Permit forward mode=open when network has no IP (bz 2255266) Patch: 0010-network-permit-forward-mode-open-when-a-network-has-.patch +# Fix potential dataloss on snapshot deletion +Patch11: 0011-qemu-snapshot-delete-disk-image-only-if-parent-snaps.patch + Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} @@ -2638,6 +2641,9 @@ exit 0 %changelog +* Wed Mar 05 2025 Cole Robinson - 10.6.0-7 +- Fix potential dataloss on snapshot deletion + * Sat Dec 14 2024 Cole Robinson - 10.6.0-6 - Fix DHCP response checksum when using nftables firewall - Permit forward mode=open when network has no IP (bz 2255266)