[libvirt PATCH v2 06/10] qemu: block: add function to collect blockcommit params and verify them
Peter Krempa
pkrempa at redhat.com
Mon May 18 12:08:55 UTC 2020
On Wed, May 06, 2020 at 13:42:22 +0200, Pavel Mores wrote:
> Snapshot deletion is implemented as a three-phase process - first we
> collect specifications of blockcommits used to perform the deletion and
> run sanity checks to verify that the whole operation is reasonably safe,
> then we launch the blockcommits and finally we wait for them to finish and
> check the results.
>
> This commit implements the first phase. All information necessary to
> launch and finish a blockcommit job per disk included in the snapshot is
> collected in a blockcommit descriptor structure and checked to verify the
> job makes sense and has a reasonable chance to succeed. Broadly speaking,
> the checks aim to ensure that the disks in the current running VM are the
> same as they were when the snapshot was created.
>
> Signed-off-by: Pavel Mores <pmores at redhat.com>
> ---
> src/qemu/qemu_driver.c | 154 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 154 insertions(+)
>
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 6ffd53503b..dc1176bd9c 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -16752,6 +16752,160 @@ qemuDomainMomentReparentChildren(void *payload,
> }
>
>
> +/* Blockcommit operation descriptor. Holds data required to launch and
> + * conclude an individual blockcommit job. Generic parameters
> + * (virDomainObjPtr, virQEMUDriverPtr) are not stored as they are assumed to be
> + * available at the point of blockcommit invocation. */
> +
> +typedef struct {
> + virDomainDiskDefPtr disk;
> + virStorageSourcePtr baseSource;
> + virStorageSourcePtr topSource;
> + virStorageSourcePtr topParentSource;
> + int blockCommitFlags;
> + bool isActive; /* used to find out if pivot is needed to finish the job */
> +} virBlockCommitDesc;
> +
> +/* Transforms a snapshot into an array of descriptors of blockcommit jobs
> + * required to delete the snapshot, one descriptor per affected disk. Also
> + * runs sanity checks for each affected disk and each individual job to make
> + * sure the deletion is safe to perform. Returns NULL if safety cannot be
> + * guaranteed.
> + *
> + * (A snapshot is considered safe to delete if, loosely speaking, we can be
> + * reasonably sure that all disks it touches are still those that were there
> + * when the snapshot was created. For instance, a different disk might be
> + * attached to the VM under the same target name, or a disk included in the
> + * snapshot might be reattached to the VM under a different target name. If
> + * any such thing happens between the times of snapshot creation and deletion,
> + * that shapshot would not be considered safe to delete.) */
> +
> +static virBlockCommitDesc *
> +qemuDomainSnapshotDeleteExternalGetJobDescriptors(virDomainObjPtr vm,
> + virDomainMomentObjPtr snap,
> + unsigned int flags)
> +{
> + size_t i;
> + bool isActive;
> + virDomainSnapshotDefPtr snapdef = virDomainSnapshotObjGetDef(snap);
> + virDomainMomentObjPtr parent = snap->parent;
> + virDomainSnapshotDefPtr parentdef = virDomainSnapshotObjGetDef(parent);
> + g_autofree virBlockCommitDesc *blockCommitDescs = g_new(virBlockCommitDesc, snapdef->ndisks);
> + int blockCommitFlags = VIR_DOMAIN_BLOCK_COMMIT_DELETE;
> +
> + if (flags & (VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN |
> + VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY)) {
> + isActive = true;
> + } else {
> + isActive = snap == virDomainSnapshotGetCurrent(vm->snapshots);
> + }
> +
> + if (isActive)
> + blockCommitFlags |= VIR_DOMAIN_BLOCK_COMMIT_ACTIVE;
> +
> + for (i = 0; i < snapdef->ndisks; i++) {
> + virDomainSnapshotDiskDefPtr snapDisk = &(snapdef->disks[i]);
> + const char *diskName = snapDisk->name;
> + virStorageSourcePtr baseSource = NULL;
> + virStorageSourcePtr topSource = NULL;
> + virStorageSourcePtr topParentSource = NULL;
> + virDomainDiskDefPtr domDiskNow;
> + virDomainDiskDefPtr domDiskThen = virDomainDiskByTarget(snapdef->parent.dom, diskName);
> + virStorageSourcePtr snapSource = NULL;
> + virStorageSourcePtr snapParentSource = NULL;
> + unsigned int snapIndex;
> +
> + if (!(domDiskNow = qemuDomainDiskByName(vm->def, diskName))) {
> + virReportError(VIR_ERR_OPERATION_INVALID,
> + _("can't delete %s, disk '%s' not found in running VM"),
> + snapdef->parent.name, diskName);
> + return NULL;
> + }
> + if (snapDisk->src->type != VIR_STORAGE_TYPE_FILE ||
I can understand this so that you can look up based on the path ..
> + domDiskNow->src->type != VIR_STORAGE_TYPE_FILE) {
But the code doesn't seem to care about the path of the current top
image. And I'd expect that it might be a problem if there are other
non-file disks in the chain too.
> + virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
> + _("can't delete %s, only storage type 'file' is supported"),
> + snapdef->parent.name);
> + return NULL;
> + }
> +
> + /* TODO Apr 24, 2020: this is not great long-term as it still looks up
> + * essentially just by path (or target[index]), far from a full
> + * comparison operator for virStorageSources */
> + if (virStorageFileParseChainIndex(domDiskNow->dst, snapDisk->src->path, &snapIndex) < 0 ||
Additionally disk->src->path never contains target[index] syntax so this
call is pointless.
> + !(snapSource = virStorageFileChainLookup(domDiskNow->src, NULL,
> + snapDisk->src->path, snapIndex,
> + &snapParentSource)))
> + return NULL;
> +
> + if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) {
> + baseSource = snapSource;
> + } else {
> + if (parentdef == NULL) {
> + baseSource = virStorageFileChainLookup(domDiskNow->src, NULL, NULL, 0, NULL);
> + if (!baseSource)
> + return NULL;
> + } else {
> + baseSource = snapSource->backingStore;
> + }
> + }
> +
> + if (flags & (VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY)) {
> + topSource = domDiskNow->src;
> + } else {
> + topSource = snapSource;
> + topParentSource = snapParentSource;
> + }
I'm actually missing a check that anything between topSource and
baseSource are virStorageSources which are tracked by snapshot metadata
which is going to be deleted.
Basically we must make sure that we are not merging layers which are not
described by snapshot metadata.
> +
> + if (topSource == NULL) {
> + virReportError(VIR_ERR_OPERATION_INVALID,
> + _("can't delete %s, couldn't find top (TODO improve this message)"),
> + snapdef->parent.name);
> + return NULL;
> + }
> +
> + if (baseSource == NULL) {
> + virReportError(VIR_ERR_OPERATION_INVALID,
> + _("can't delete %s, couldn't find base (TODO improve this message)"),
> + snapdef->parent.name);
> + return NULL;
> + }
> +
> + /* Check if the disk called 'diskName' is the same as it was at the
> + * point 'snap' was created. This is more of a heuristic test as
> + * virStorageSources don't seem to be well equipped for establishing
> + * identity. The idea is based on the assumption that snapshots can
> + * only be removed mid-chain, not added. If that holds, the currently
> + * running chain has to be the same as it was when 'snap' was created
> + * *minus* the snapshots that were deleted in the meantime, if any. In
> + * other words, the chain back at the time of 'snap's creation has to
> + * be an ordered superset of the currently running disk's chain. */
> + virStorageSourcePtr chainNow = snapSource->backingStore;
> + virStorageSourcePtr chainThen = NULL;
> + for (; virStorageSourceIsBacking(chainNow); chainNow = chainNow->backingStore) {
> + chainThen = virStorageFileChainLookup(domDiskThen->src,
> + chainThen, chainNow->path, 0, NULL);
> + if (!chainThen) {
> + virReportError(VIR_ERR_OPERATION_INVALID,
> + _("can't delete %s, disk '%s' doesn't seem the same as when it was created (%s is in %s's backing chain now but it wasn't when the snapshot was created)"),
> + snapdef->parent.name, diskName, chainNow->path,
> + snapdef->parent.name);
> + return NULL;
> + }
> + }
IMO the above is not as important as making sure that the chain between
the images which are going to be deleted is the same as we track in
metadata. The rest of the chain is not important if we zoom in to this
one particular deletion.
> +
> + blockCommitDescs[i].disk = domDiskNow;
> + blockCommitDescs[i].baseSource = baseSource;
> + blockCommitDescs[i].topSource = topSource;
> + blockCommitDescs[i].topParentSource = topParentSource;
> + blockCommitDescs[i].blockCommitFlags = blockCommitFlags;
> + blockCommitDescs[i].isActive = isActive;
> + }
> +
> + return g_steal_pointer(&blockCommitDescs);
> +}
> +
> +
> static int
> qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot,
> unsigned int flags)
> --
> 2.24.1
>
More information about the libvir-list
mailing list