From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 5E7091FF185 for ; Mon, 21 Jul 2025 14:10:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2BB88CE44; Mon, 21 Jul 2025 14:11:33 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 21 Jul 2025 14:10:49 +0200 Message-ID: <20250721121124.77526-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250721121124.77526-1-f.ebner@proxmox.com> References: <20250721121124.77526-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753099880881 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.028 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 4/9] api: status: rely on get_formats() method for determining format-related info 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Rely on get_formats() rather than just the static plugin data in the 'status' API call. This removes the need for the special casing for LVM storages without the 'snapshot-as-volume-chain' option. It also fixes the issue that the 'format' storage configuration option to override the default format was previously ignored there. Signed-off-by: Fiona Ebner --- src/PVE/API2/Storage/Status.pm | 6 ------ src/PVE/Storage.pm | 5 +++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Status.pm index 25933f8..c172073 100644 --- a/src/PVE/API2/Storage/Status.pm +++ b/src/PVE/API2/Storage/Status.pm @@ -220,12 +220,6 @@ __PACKAGE__->register_method({ $data->{used_fraction} = ($data->{used} // 0) / $data->{total}; } - # TODO: add support to the storage plugin system to allow returing different supported - # formats depending on the storage config instead, this is just a stop gap! - if (lc($data->{type}) eq 'lvm') { - $data->{format}->[0]->{qcow2} = 0 if !$scfg->{'snapshot-as-volume-chain'}; - } - $res->{$storeid} = $data; } diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm index 1faf893..3286144 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -1511,9 +1511,10 @@ sub storage_info { my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); if ($includeformat) { + my $formats = $plugin->get_formats($scfg, $storeid); + $info->{$storeid}->{format} = [$formats->{valid}, $formats->{default}]; + my $pd = $plugin->plugindata(); - $info->{$storeid}->{format} = $pd->{format} - if $pd->{format}; $info->{$storeid}->{select_existing} = $pd->{select_existing} if $pd->{select_existing}; } -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel