From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id D677B1FF0AF for ; Thu, 24 Sep 2026 18:16:29 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id ED93021745; Thu, 24 Sep 2026 18:15:41 +0200 (CEST) From: =?UTF-8?q?Michael=20K=C3=B6ppl?= To: pve-devel@lists.proxmox.com Subject: [PATCH container v6 12/18] api: record CT ID as used on destruction and remote migration Date: Thu, 24 Sep 2026 18:15:04 +0200 Message-ID: <20260924161510.847362-13-m.koeppl@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260924161510.847362-1-m.koeppl@proxmox.com> References: <20260924161510.847362-1-m.koeppl@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1790266513433 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.446 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 56U4CIVTGN5NGQ3X2D53XGZFGCGIJCBH X-Message-ID-Hash: 56U4CIVTGN5NGQ3X2D53XGZFGCGIJCBH X-MailFrom: m.koeppl@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Record the ID of a CT as used when it is destroyed or removed after a remote migration with --delete, so that the `/cluster/nextid` endpoint can later optionally avoid suggesting previously used IDs. For creation, restore and incoming remote migrations the ID is recorded by create_and_lock_config(). Recording on destruction as well covers guests that were created before IDs were tracked. The same holds for a remote migration with --delete, which removes the source guest without going through the destroy API; that call only warns on failure, since the guest has already moved. With 'unique' set in the next-id datacenter option, a failure to record aborts create, clone and destroy before anything is changed. Otherwise it only warns. Originally-by: Daniel Krambrock Originally-by: Severen Redwood Signed-off-by: Michael Köppl --- src/PVE/API2/LXC.pm | 5 +++++ src/PVE/LXC/Migrate.pm | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index 5f94d5a1..fb4262c9 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -14,6 +14,7 @@ use PVE::DataCenterConfig; use PVE::Exception qw(raise raise_param_exc raise_perm_exc); use PVE::Firewall; use PVE::GuestHelpers; +use PVE::GuestID; use PVE::INotify; use PVE::JSONSchema qw(get_standard_option); use PVE::RESTHandler; @@ -882,6 +883,10 @@ __PACKAGE__->register_method({ $early_checks->($conf); + # record before destroying anything, so a failure here leaves the CT intact + eval { PVE::GuestID::register_used_id($vmid) }; + die "unable to destroy CT $vmid - $@" if $@; + my $running_error_msg = "unable to destroy CT $vmid - container is running\n"; die $running_error_msg if !$param->{force} && PVE::LXC::check_running($vmid); # check early diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm index d243d901..a215dede 100644 --- a/src/PVE/LXC/Migrate.pm +++ b/src/PVE/LXC/Migrate.pm @@ -7,6 +7,7 @@ use File::Basename; use File::Copy; # fixme: remove use PVE::Cluster; +use PVE::GuestID; use PVE::INotify; use PVE::JSONSchema; use PVE::Replication; @@ -541,6 +542,9 @@ sub final_cleanup { PVE::Tunnel::write_tunnel($self->{tunnel}, 60, 'start'); } if ($self->{opts}->{delete}) { + eval { PVE::GuestID::register_used_id($vmid) }; + warn $@ if $@; + PVE::LXC::destroy_lxc_container( PVE::Storage::config(), $vmid, -- 2.47.3