From: Daniel Kral <d.kral@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH ha-manager] resources: assert ha resource has correct guest type
Date: Mon, 12 Jan 2026 11:16:49 +0100 [thread overview]
Message-ID: <20260112101728.162151-1-d.kral@proxmox.com> (raw)
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 <sid>` and
re-adding it correctly, is still possible.
Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
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
next reply other threads:[~2026-01-12 10:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-12 10:16 Daniel Kral [this message]
2026-01-12 16:24 ` Michael Köppl
2026-01-13 13:42 ` [pve-devel] applied: " Fiona Ebner
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=20260112101728.162151-1-d.kral@proxmox.com \
--to=d.kral@proxmox.com \
--cc=pve-devel@lists.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