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 7292C94C12 for ; Thu, 11 Apr 2024 11:33:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C63391DFE4 for ; Thu, 11 Apr 2024 11:33:19 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 11 Apr 2024 11:33:16 +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 06A8E44A46 for ; Thu, 11 Apr 2024 11:33:16 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 11 Apr 2024 11:29:34 +0200 Message-Id: <20240411092943.57377-14-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240411092943.57377-1-f.ebner@proxmox.com> References: <20240411092943.57377-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.072 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 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 v3 13/22] vzdump: handle new 'fleecing' property string 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, 11 Apr 2024 09:33:20 -0000 Signed-off-by: Fiona Ebner --- Changes in v3: * return result from parsing PVE/VZDump.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 72461f73..812357bd 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -130,6 +130,17 @@ my $generate_notes = sub { return $notes_template; }; +my sub parse_fleecing { + my ($param) = @_; + + if (defined(my $fleecing = $param->{fleecing})) { + return $fleecing if ref($fleecing) eq 'HASH'; # already parsed + $param->{fleecing} = PVE::JSONSchema::parse_property_string('backup-fleecing', $fleecing); + } + + return $param->{fleecing}; +} + my sub parse_performance { my ($param) = @_; @@ -282,6 +293,7 @@ sub read_vzdump_defaults { } keys %$confdesc_for_defaults }; $parse_prune_backups_maxfiles->($defaults, "defaults in VZDump schema"); + parse_fleecing($defaults); parse_performance($defaults); my $raw; @@ -308,6 +320,7 @@ sub read_vzdump_defaults { $res->{mailto} = [ @mailto ]; } $parse_prune_backups_maxfiles->($res, "options in '$fn'"); + parse_fleecing($res); parse_performance($res); foreach my $key (keys %$defaults) { @@ -1457,6 +1470,7 @@ sub verify_vzdump_parameters { if defined($param->{'prune-backups'}) && defined($param->{maxfiles}); $parse_prune_backups_maxfiles->($param, 'CLI parameters'); + parse_fleecing($param); parse_performance($param); if (my $template = $param->{'notes-template'}) { -- 2.39.2