From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8066D6166D for ; Thu, 9 Jul 2020 13:21:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6FEDB11C49 for ; Thu, 9 Jul 2020 13:21:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 3F5ED11C3F for ; Thu, 9 Jul 2020 13:21:30 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 05C51430BA for ; Thu, 9 Jul 2020 13:21:30 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Thu, 9 Jul 2020 13:21:28 +0200 Message-Id: <20200709112128.27030-1-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 Subject: [pve-devel] [PATCH manager] vzdump: included_guest: return empty hash if no guests selected 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: , X-List-Received-Date: Thu, 09 Jul 2020 11:21:31 -0000 This will fix the behaviour when calling `vzdump --stop` to cause all local guests to be backed up. When refactoring this logic in commit be308647, the assumption was that every call will have one of the following parameters set: pool, list of VMIDs or all (intentional or when exclude is used). There is an addtional possibility, that vzdump is called with only --stop. Thus there are no other parameters that would indicate which VMIDs to include. In this case we want to return the empty hash. Signed-off-by: Aaron Lauterer --- PVE/VZDump.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 1f0eb246..601cd56e 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -1170,7 +1170,7 @@ sub get_included_guests { $vmids = PVE::API2Tools::get_resource_pool_guest_members($job->{pool}); } elsif ($job->{vmid}) { $vmids = [ split_list($job->{vmid}) ]; - } else { + } elsif ($job->{all}) { # all or exclude my $exclude = check_vmids(split_list($job->{exclude})); my $excludehash = { map { $_ => 1 } @$exclude }; @@ -1179,6 +1179,8 @@ sub get_included_guests { next if $excludehash->{$id}; push @$vmids, $id; } + } else { + return $vmids_per_node; } $vmids = check_vmids(@$vmids); -- 2.20.1