4:36 a.m.
With introduction of external snapshot revert we will have to update
backing store of qcow images not actively used be QEMU manually.
The need for this patch comes from the fact that we stop and start QEMU
process therefore after revert not all existing snapshots will be known
to that QEMU process due to reverting to non-leaf snapshot or having
multiple branches.
We need to loop over all existing snapshots and check all disks to see
if they happen to have the image we are deleting as backing store and
update them to point to the new image except for images currently used
by the running QEMU process doing the merge operation.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/qemu/qemu_snapshot.c | 122 +++++++++++++++++++++++++++++++++++++++
1 file changed, 122 insertions(+)
diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 0238ab2249..8d0581d33b 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -2588,6 +2588,8 @@ typedef struct _qemuSnapshotDeleteExternalData {
virStorageSource *parentDiskSrc; /* backing disk source of the @diskSrc */
virStorageSource *prevDiskSrc; /* source of disk for which @diskSrc is
backing disk */
+ GSList *disksWithBacking; /* list of storage source data for which the
+ deleted storage source is backing store */
qemuBlockJobData *job;
bool merge;
} qemuSnapshotDeleteExternalData;
@@ -2600,6 +2602,7 @@ qemuSnapshotDeleteExternalDataFree(qemuSnapshotDeleteExternalData
*data)
return;
virObjectUnref(data->job);
+ g_slist_free_full(data->disksWithBacking, g_free);
g_free(data);
}
@@ -2649,6 +2652,84 @@ qemuSnapshotFindParentSnapForDisk(virDomainMomentObj *snap,
}
+struct _qemuSnapshotDisksWithBackingStoreData {
+ virStorageSource *diskSrc;
+ uid_t uid;
+ gid_t gid;
+};
+
+
+struct _qemuSnapshotDisksWithBackingStoreIterData {
+ virDomainMomentObj *current;
+ virStorageSource *diskSrc;
+ GSList **disksWithBacking;
+ virQEMUDriverConfig *cfg;
+};
+
+
+static int
+qemuSnapshotDiskHasBackingDisk(void *payload,
+ const char *name G_GNUC_UNUSED,
+ void *opaque)
+{
+ virDomainMomentObj *snap = payload;
+ virDomainSnapshotDef *snapdef = virDomainSnapshotObjGetDef(snap);
+ struct _qemuSnapshotDisksWithBackingStoreIterData *iterdata = opaque;
+ ssize_t i;
+
+ /* skip snapshots that are within the active snapshot tree as it will be handled
+ * by qemu */
+ if (virDomainMomentIsAncestor(iterdata->current, snap) || iterdata->current ==
snap)
+ return 0;
+
+ for (i = 0; i < snapdef->parent.dom->ndisks; i++) {
+ virDomainDiskDef *disk = snapdef->parent.dom->disks[i];
+ uid_t uid;
+ gid_t gid;
+
+ if (!virStorageSourceIsLocalStorage(disk->src))
+ continue;
+
+ qemuDomainGetImageIds(iterdata->cfg, snapdef->parent.dom, disk->src,
+ NULL, &uid, &gid);
+
+ if (!disk->src->backingStore)
+ ignore_value(virStorageSourceGetMetadata(disk->src, uid, gid, 1, false));
+
+ if (virStorageSourceIsSameLocation(disk->src->backingStore,
iterdata->diskSrc)) {
+ struct _qemuSnapshotDisksWithBackingStoreData *data =
+ g_new0(struct _qemuSnapshotDisksWithBackingStoreData, 1);
+
+ data->diskSrc = disk->src;
+ data->uid = uid;
+ data->gid = gid;
+
+ *iterdata->disksWithBacking =
g_slist_prepend(*iterdata->disksWithBacking, data);
+ }
+ }
+
+ return 0;
+}
+
+
+static void
+qemuSnapshotGetDisksWithBackingStore(virDomainObj *vm,
+ virDomainMomentObj *snap,
+ qemuSnapshotDeleteExternalData *data)
+{
+ struct _qemuSnapshotDisksWithBackingStoreIterData iterData;
+ virQEMUDriver *driver = QEMU_DOMAIN_PRIVATE(vm)->driver;
+ g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+
+ iterData.current = virDomainSnapshotGetCurrent(vm->snapshots);
+ iterData.diskSrc = data->diskSrc;
+ iterData.disksWithBacking = &data->disksWithBacking;
+ iterData.cfg = cfg;
+
+ virDomainMomentForEachDescendant(snap, qemuSnapshotDiskHasBackingDisk,
&iterData);
+}
+
+
/**
* qemuSnapshotDeleteExternalPrepareData:
* @vm: domain object
@@ -2733,6 +2814,8 @@ qemuSnapshotDeleteExternalPrepareData(virDomainObj *vm,
_("snapshot VM disk source and parent disk source
are not the same"));
return -1;
}
+
+ qemuSnapshotGetDisksWithBackingStore(vm, snap, data);
}
data->parentSnap = qemuSnapshotFindParentSnapForDisk(snap,
data->snapDisk);
@@ -3129,6 +3212,43 @@ qemuSnapshotSetInvalid(virDomainObj *vm,
}
+static void
+qemuSnapshotUpdateBackingStore(virDomainObj *vm,
+ qemuSnapshotDeleteExternalData *data)
+{
+ GSList *cur = NULL;
+ const char *qemuImgPath;
+ virQEMUDriver *driver = QEMU_DOMAIN_PRIVATE(vm)->driver;
+
+ if (!(qemuImgPath = qemuFindQemuImgBinary(driver)))
+ return;
+
+ for (cur = data->disksWithBacking; cur; cur = g_slist_next(cur)) {
+ struct _qemuSnapshotDisksWithBackingStoreData *backingData = cur->data;
+ g_autoptr(virCommand) cmd = NULL;
+
+ /* creates cmd line args: qemu-img create -f qcow2 -o */
+ if (!(cmd = virCommandNewArgList(qemuImgPath,
+ "rebase",
+ "-u",
+ "-F",
+
virStorageFileFormatTypeToString(data->parentDiskSrc->format),
+ "-f",
+
virStorageFileFormatTypeToString(backingData->diskSrc->format),
+ "-b",
+ data->parentDiskSrc->path,
+ backingData->diskSrc->path,
+ NULL)))
+ continue;
+
+ virCommandSetUID(cmd, backingData->uid);
+ virCommandSetGID(cmd, backingData->gid);
+
+ ignore_value(virCommandRun(cmd, NULL));
+ }
+}
+
+
static int
qemuSnapshotDiscardExternal(virDomainObj *vm,
virDomainMomentObj *snap,
@@ -3215,6 +3335,8 @@ qemuSnapshotDiscardExternal(virDomainObj *vm,
qemuBlockJobSyncEnd(vm, data->job, VIR_ASYNC_JOB_SNAPSHOT);
+ qemuSnapshotUpdateBackingStore(vm, data);
+
if (qemuSnapshotSetInvalid(vm, data->parentSnap, data->snapDisk, false)
< 0)
goto error;
}
--
2.41.0