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 4AC8294BCE for ; Thu, 11 Apr 2024 11:33:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 192301DFC6 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:15 +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 5A14C44A6A for ; Thu, 11 Apr 2024 11:33:15 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 11 Apr 2024 11:29:31 +0200 Message-Id: <20240411092943.57377-11-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-Type: text/plain; charset=UTF-8 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 guest-common v3 10/22] vzdump: schema: make storage for fleecing semi-optional 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:19 -0000 so it doesn't need to be set when explicitly disabling fleecing. Needs a custom verifier to enforce it being set when enabled. Suggested-by: Fabian Grünbichler Signed-off-by: Fiona Ebner --- src/PVE/VZDump/Common.pm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/PVE/VZDump/Common.pm b/src/PVE/VZDump/Common.pm index 30bd044..f7cdb66 100644 --- a/src/PVE/VZDump/Common.pm +++ b/src/PVE/VZDump/Common.pm @@ -95,8 +95,20 @@ PVE::JSONSchema::register_format('backup-fleecing', { description => "Use this storage to storage fleecing images. For efficient space usage, " ."it's best to use a local storage that supports discard and either thin provisioning " ."or sparse files.", + optional => 1, }), -}); +}, \&verify_backup_fleecing); + +sub verify_backup_fleecing { + my ($param, $noerr) = @_; + + if (!$param->{storage} && $param->{enabled}) { + return if $noerr; + die "'storage' parameter is required when 'enabled' is set\n"; + } + + return $param; +} PVE::JSONSchema::register_format('backup-performance', { 'max-workers' => { -- 2.39.2