From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager] get_included_guests: handle non-existing guests
Date: Mon, 19 Oct 2020 12:53:00 +0200 [thread overview]
Message-ID: <20201019105300.17898-1-f.ebner@proxmox.com> (raw)
If a guest is removed without purge, the ID will remain
in the backup configuration. Avoid using the variable $node
when it is potentially undefined. Instead, skip non-existing
guests and warn the user.
Reported here:
https://forum.proxmox.com/threads/purge-backup-does-not-remove-vm-from-datacenter-backup-list.77609/
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/VZDump.pm | 5 +++++
test/vzdump_guest_included_test.pl | 12 +++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 542228d6..6dbb6a44 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -1217,6 +1217,11 @@ sub get_included_guests {
$vmids = check_vmids(@$vmids);
for my $vmid (@$vmids) {
+ if (!defined($vmlist->{ids}->{$vmid})) {
+ debugmsg('warn', "no guest with ID '$vmid' exists in the cluster!");
+ next;
+ }
+
my $node = $vmlist->{ids}->{$vmid}->{node};
next if (defined $job->{node} && $job->{node} ne $node);
diff --git a/test/vzdump_guest_included_test.pl b/test/vzdump_guest_included_test.pl
index a0f40a55..0494d40e 100755
--- a/test/vzdump_guest_included_test.pl
+++ b/test/vzdump_guest_included_test.pl
@@ -9,7 +9,7 @@ use warnings;
use lib '..';
-use Test::More tests => 9;
+use Test::More tests => 10;
use Test::MockModule;
use PVE::VZDump;
@@ -178,6 +178,16 @@ $addtest->('Test selected VMIDs on other nodes', {
}
});
+$addtest->('Test VMID not present in vmlist', {
+ expected => {
+ node1 => [ 100 ],
+ node2 => [ 201, 212 ],
+ },
+ param => {
+ vmid => '100, 201, 212, 7654',
+ }
+});
+
for my $test (@{$tests}) {
my $testname = $test->{name};
--
2.20.1
next reply other threads:[~2020-10-19 10:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 10:53 Fabian Ebner [this message]
2020-10-19 12:38 ` Thomas Lamprecht
2020-10-20 6:25 ` Fabian 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=20201019105300.17898-1-f.ebner@proxmox.com \
--to=f.ebner@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal