From: Dominik Csapak <d.csapak@proxmox.com>
To: Thomas Lamprecht <t.lamprecht@proxmox.com>, pve-devel@lists.proxmox.com
Subject: Re: [PATCH qemu-server 15/34] restore: take over the guest uid from the backup where possible
Date: Tue, 17 Nov 2026 16:17:28 +0100 [thread overview]
Message-ID: <0255a545-4848-4ab3-bbfd-9d120c66a586@proxmox.com> (raw)
In-Reply-To: <20261116004703.2908294-16-t.lamprecht@proxmox.com>
nits inline:
On 11/16/26 1:53 AM, Thomas Lamprecht wrote:
> A restore to an unused VMID, or over a VM without an identity, should
> keep the uid of the backup if no other guest in the cluster uses it.
> Take over that uid through the cluster-wide check of pve-guest-common
> after the data is restored and the final config is written, while
> holding the config lock. A VM that already had an identity keeps it,
> and 'unique' prevents taking over the uid. Log the outcome, and only
> warn if taking over the uid fails, as the restored VM has an identity
> of its own.
>
> Refuse to restore a backup with a different uid over an existing VM
> unless 'allow-identity-mismatch' is set in the create API or qmrestore.
> This is independent of 'force', which permits overwriting the VM. With
> the override, the VM keeps its identity, unless it has the uid of the
> backup as pending uid from an unfinished restore.
>
> For PBS, backup providers and VMA, compare the uids before resetting
> the replication state, restoring the firewall config or replacing the
> data of the target. For VMA this also works for standard input, through
> the header callback. Read the uid from the config that the restore
> itself uses, not from the best-effort extraction of the API, and ignore
> unknown members of 'meta', so that the uid of a backup from a newer
> version is not lost when the property fails to parse.
>
> Take over the uid only after the live phase, the conversion to a
> template and, with 'unique', the registration of the new MAC addresses.
> A failed restore must not take the uid and so keep a retry at another
> VMID from getting it.
>
> For a retry over a VM left behind by an unfinished restore to work,
> record the uid of the backup as a pending change of 'meta'. Record it
> after the uid check if the restore could take the uid over, also with
> 'unique', and keep it in all configs that the restore writes. A VM
> with that pending uid can be restored over without the override, and
> without 'unique' the retry takes the uid over if no other guest uses
> it. A pending uid does not count as in use.
>
> Taking over the uid removes the pending uid, whatever the outcome. If
> the cluster-wide lock cannot be taken, it stays for a retry. Starting
> the VM for a live restore keeps it while the 'create' lock is held.
> Otherwise, applying pending changes drops it, and a clone does not get
> it.
>
> Legacy tar archives predate guest identities and get no uid check.
> Their config is only available after the data is restored, so only the
> restored config can carry a pending uid.
>
> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
> ---
> src/PVE/API2/Qemu.pm | 18 +
> src/PVE/CLI/qmrestore.pm | 7 +
> src/PVE/QemuServer.pm | 142 +++++-
> src/test/QemuServerTest/FakeCFS.pm | 3 +
> src/test/restore-config-expected/150.conf | 9 +
> src/test/restore-config-input/150.conf | 10 +
> src/test/run_api_tests.pl | 13 +
> src/test/run_guest_identity_tests.pl | 77 +++
> src/test/run_qemu_restore_config_tests.pl | 559 +++++++++++++++++++++-
> 9 files changed, 828 insertions(+), 10 deletions(-)
> create mode 100644 src/test/restore-config-expected/150.conf
> create mode 100644 src/test/restore-config-input/150.conf
>
> diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm
> index 28e8389a..395dc334 100644
> --- a/src/PVE/API2/Qemu.pm
> +++ b/src/PVE/API2/Qemu.pm
> @@ -1241,6 +1241,15 @@ __PACKAGE__->register_method({
> description => "Assign a unique random ethernet address.",
> requires => 'archive',
> },
> + 'allow-identity-mismatch' => {
> + optional => 1,
> + type => 'boolean',
> + description => "Allow to overwrite an existing VM with a backup of another"
> + . " guest, as detected by a different 'uid' in 'meta'. Unless the VM is"
> + . " left over from an unfinished restore of the same backup, it keeps its"
> + . " own uid.",
> + requires => 'archive',
nit: an optional boolean should have a default.
we don't always have that on the existing properties, but
we should add it for new ones.
same nit holds for the equivalent container patch
> + },
next prev parent reply other threads:[~2026-11-17 15:17 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 0:46 [PATCH cluster/guest-common/qemu-server/container/manager/docs 00/34] fix #7846: guest identity (uid) and cluster ID Thomas Lamprecht
2026-11-16 0:46 ` [PATCH cluster 01/34] pmxcfs: reject changes to the cluster ID file from user space Thomas Lamprecht
2026-11-16 0:46 ` [PATCH cluster 02/34] pmxcfs: generate a cluster ID on standalone nodes Thomas Lamprecht
2026-11-16 0:46 ` [PATCH cluster 03/34] pmxcfs: dfsm: add a callback that runs once all members are in sync Thomas Lamprecht
2026-11-16 0:46 ` [PATCH cluster 04/34] pmxcfs: quorum: pass the corosync membership to an optional listener Thomas Lamprecht
2026-11-16 0:46 ` [PATCH cluster 05/34] pmxcfs: dcdb: generate the cluster ID once the cluster is in sync Thomas Lamprecht
2026-11-16 0:46 ` [PATCH cluster 06/34] cluster: add helper to read the cluster ID Thomas Lamprecht
2026-11-16 0:46 ` [PATCH cluster 07/34] pmxcfs: allow removing the cluster ID file in forced local mode Thomas Lamprecht
2026-11-16 0:46 ` [PATCH guest-common 08/34] guest identity: add helpers for the guest uid and registration time Thomas Lamprecht
2026-11-17 10:47 ` Dominik Csapak
2026-11-16 0:46 ` [PATCH guest-common 09/34] abstract config: assign a guest identity and keep it on config writes Thomas Lamprecht
2026-11-17 10:47 ` Dominik Csapak
2026-11-17 12:47 ` Dominik Csapak
2026-11-16 0:46 ` [PATCH guest-common 10/34] abstract config: let the VMID reservation return the previous state Thomas Lamprecht
2026-11-16 0:46 ` [PATCH guest-common 11/34] guest identity: allow taking over a uid that is unused in the cluster Thomas Lamprecht
2026-11-17 13:14 ` Dominik Csapak
2026-11-16 0:46 ` [PATCH qemu-server 12/34] api: restore: release the VMID if a restore to an unused VMID fails Thomas Lamprecht
2026-11-16 0:46 ` [PATCH qemu-server 13/34] api: migrate, clone: refuse targets that would drop the guest identity Thomas Lamprecht
2026-11-16 0:46 ` [PATCH qemu-server 14/34] fix #7846: config: add a guest identity to the 'meta' property Thomas Lamprecht
2026-11-16 0:46 ` [PATCH qemu-server 15/34] restore: take over the guest uid from the backup where possible Thomas Lamprecht
2026-11-17 15:17 ` Dominik Csapak [this message]
2026-11-16 0:46 ` [PATCH qemu-server 16/34] api: remote migration: take over the guest uid from the source Thomas Lamprecht
2026-11-17 15:26 ` Dominik Csapak
2026-11-16 0:46 ` [PATCH qemu-server 17/34] api: status: return the guest uid Thomas Lamprecht
2026-11-16 0:46 ` [PATCH container 18/34] config: add read-only meta property with the creation time Thomas Lamprecht
2026-11-16 0:46 ` [PATCH container 19/34] fix #7846: config: add a guest identity to the 'meta' property Thomas Lamprecht
2026-11-16 0:46 ` [PATCH container 20/34] api: migrate, clone: refuse targets that would drop the guest identity Thomas Lamprecht
2026-11-16 0:46 ` [PATCH container 21/34] restore: take over the guest uid from the backup where possible Thomas Lamprecht
2026-11-16 0:46 ` [PATCH container 22/34] restore: refuse overwriting a container with another guest's backup Thomas Lamprecht
2026-11-16 0:46 ` [PATCH container 23/34] migrate: remote: clean up the target on a tunnel version mismatch Thomas Lamprecht
2026-11-16 0:46 ` [PATCH container 24/34] api: remote migration: take over the guest uid from the source Thomas Lamprecht
2026-11-16 0:46 ` [PATCH container 25/34] api: status: return the guest uid Thomas Lamprecht
2026-11-16 0:46 ` [PATCH manager 26/34] api: cluster resources: add guest uid and registration time Thomas Lamprecht
2026-11-17 15:30 ` Dominik Csapak
2026-11-16 0:46 ` [PATCH manager 27/34] api: cluster status: add cluster ID Thomas Lamprecht
2026-11-16 0:46 ` [PATCH manager 28/34] ui: restore: allow overwriting a guest with a backup of another guest Thomas Lamprecht
2026-11-16 0:46 ` [PATCH manager 29/34] ui: migrate: refuse target nodes that would drop the guest identity Thomas Lamprecht
2026-11-16 0:46 ` [PATCH manager 30/34] ui: guest summary: show " Thomas Lamprecht
2026-11-17 15:44 ` Dominik Csapak
2026-11-16 0:46 ` [PATCH docs 31/34] vzdump: describe the guest identity of VMs and containers Thomas Lamprecht
2026-11-16 0:46 ` [PATCH docs 32/34] pvecm: document the cluster ID and how to get a new one Thomas Lamprecht
2026-11-16 0:46 ` [PATCH docs 33/34] qm: configuration: describe the read-only meta property Thomas Lamprecht
2026-11-16 0:46 ` [PATCH docs 34/34] pct: " Thomas Lamprecht
2026-11-17 10:47 ` [PATCH cluster/guest-common/qemu-server/container/manager/docs 00/34] fix #7846: guest identity (uid) and cluster ID Dominik Csapak
2026-11-17 11:29 ` Thomas Lamprecht
2026-11-17 11:55 ` Dominik Csapak
2026-11-17 12:47 ` Thomas Lamprecht
2026-11-17 13:54 ` Dominik Csapak
2026-11-17 15:55 ` Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0255a545-4848-4ab3-bbfd-9d120c66a586@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=t.lamprecht@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox