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 74EF2716F5 for ; Thu, 9 Sep 2021 11:58:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 60B562FD30 for ; Thu, 9 Sep 2021 11:58:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 309012FD25 for ; Thu, 9 Sep 2021 11:58:05 +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 F26AF44655 for ; Thu, 9 Sep 2021 11:58:04 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 9 Sep 2021 11:58:01 +0200 Message-Id: <20210909095801.101797-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.376 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 storage] prune {validate, mark}: preserve input parameter 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 Sep 2021 09:58:36 -0000 While the current way to detect settings like { 'keep-last' => 0 } is concise, it's also wrong, because but the delete operation is visible to the caller. This resulted in e.g. # $hash is { 'keep-all' => 1 } my $s = print_property_string($hash, 'prune-backups'); # $hash is now {}, $s is 'keep-all=1' because validation is called in print_property_string. The same issue is present when calling prune_mark_backup_group. Because validation complains when keep-all and something else is set, this shouldn't have caused any real issues, besides vzdump with keep-all=1 wrongly taking the removal path, but without any settings, so not removing anything: INFO: prune older backups with retention: INFO: pruned 0 backup(s) Signed-off-by: Fabian Ebner --- PVE/Storage.pm | 5 ++--- PVE/Storage/Plugin.pm | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index c04b5a2..7b319fe 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -1666,10 +1666,9 @@ my $prune_mark = sub { sub prune_mark_backup_group { my ($backup_group, $keep) = @_; - my $keep_all = delete $keep->{'keep-all'}; + my @positive_opts = grep { $_ ne 'keep-all' && $keep->{$_} > 0 } keys $keep->%*; - if ($keep_all || !scalar(grep {$_ > 0} values %{$keep})) { - $keep = { 'keep-all' => 1 } if $keep_all; + if ($keep->{'keep-all'} || scalar(@positive_opts) == 0) { foreach my $prune_entry (@{$backup_group}) { $prune_entry->{mark} = 'keep'; } diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index b1865cb..870091d 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -93,11 +93,12 @@ PVE::JSONSchema::register_format('prune-backups', $prune_backups_format, \&valid sub validate_prune_backups { my ($prune_backups) = @_; - my $keep_all = delete $prune_backups->{'keep-all'}; + my @positive_opts = + grep { $_ ne 'keep-all' && $prune_backups->{$_} > 0 } keys $prune_backups->%*; - if (!scalar(grep {$_ > 0} values %{$prune_backups})) { + if (scalar(@positive_opts) == 0) { $prune_backups = { 'keep-all' => 1 }; - } elsif ($keep_all) { + } elsif ($prune_backups->{'keep-all'}) { die "keep-all cannot be set together with other options.\n"; } -- 2.30.2