From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id B55D11FF139 for ; Mon, 12 Jan 2026 11:17:35 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1B9F11A1C2; Mon, 12 Jan 2026 11:17:35 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Mon, 12 Jan 2026 11:16:49 +0100 Message-ID: <20260112101728.162151-1-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1768213008441 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH ha-manager] resources: assert ha resource has correct guest type X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Otherwise a HA resource with the wrong guest type can be added to the HA resources configuration, which will make its methods (start, shutdown, migrate, ...) fail. This does not fixup existing HA resource entries with the wrong guest type, but manual removal, e.g., through `ha-manager remove ` and re-adding it correctly, is still possible. Signed-off-by: Daniel Kral --- src/PVE/HA/Resources/PVECT.pm | 12 +++++++++--- src/PVE/HA/Resources/PVEVM.pm | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/PVE/HA/Resources/PVECT.pm b/src/PVE/HA/Resources/PVECT.pm index 091249d7..55f0373b 100644 --- a/src/PVE/HA/Resources/PVECT.pm +++ b/src/PVE/HA/Resources/PVECT.pm @@ -53,13 +53,19 @@ sub exists { my ($class, $vmid, $noerr) = @_; my $vmlist = PVE::Cluster::get_vmlist(); + my $entry = $vmlist->{ids}->{$vmid}; - if (!defined($vmlist->{ids}->{$vmid})) { + if (!defined($entry)) { die "resource 'ct:$vmid' does not exist in cluster\n" if !$noerr; return undef; - } else { - return 1; } + + if ($entry->{type} ne 'lxc') { + die "resource 'ct:$vmid' is not a container\n" if !$noerr; + return undef; + } + + return 1; } sub start { diff --git a/src/PVE/HA/Resources/PVEVM.pm b/src/PVE/HA/Resources/PVEVM.pm index d1bc3329..3664837b 100644 --- a/src/PVE/HA/Resources/PVEVM.pm +++ b/src/PVE/HA/Resources/PVEVM.pm @@ -53,13 +53,19 @@ sub exists { my ($class, $vmid, $noerr) = @_; my $vmlist = PVE::Cluster::get_vmlist(); + my $entry = $vmlist->{ids}->{$vmid}; - if (!defined($vmlist->{ids}->{$vmid})) { + if (!defined($entry)) { die "resource 'vm:$vmid' does not exist in cluster\n" if !$noerr; return undef; - } else { - return 1; } + + if ($entry->{type} ne 'qemu') { + die "resource 'vm:$vmid' is not a VM\n" if !$noerr; + return undef; + } + + return 1; } sub start { -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel