From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 16DE41FF16F
for <inbox@lore.proxmox.com>; Tue, 15 Apr 2025 15:51:05 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id A7CF2942A;
Tue, 15 Apr 2025 15:50:57 +0200 (CEST)
From: Daniel Kral <d.kral@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 15 Apr 2025 15:50:20 +0200
Message-Id: <20250415135045.255272-3-d.kral@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250415135045.255272-1-d.kral@proxmox.com>
References: <20250415135045.255272-1-d.kral@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.013 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
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [storage.pm, status.pm]
Subject: [pve-devel] [PATCH storage v3 2/4] tree-wide: make use of content
type assertion helper
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
Make any code path with an existent content type assertion use the newly
introduced content type assertion helper.
Where possible, existing calls to `storage_check_enabled()` can be
lowered to calls to `storage_config()` as the former subroutine is
already called in the helper already.
Also the other code path, where there was no call to
`storage_check_enabled()` before, does not break the existing API,
because it did actions on the storage anyway and would fail on an
unavailable storage.
Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
changes since v2:
* rename helper from *_supported to *_available
* lower storage_check_enabled to storage_config where possible due to
the helper already checking that
src/PVE/API2/Storage/Status.pm | 10 ++++------
src/PVE/Storage.pm | 3 ++-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Status.pm
index 14915ae..3a929d8 100644
--- a/src/PVE/API2/Storage/Status.pm
+++ b/src/PVE/API2/Storage/Status.pm
@@ -439,7 +439,7 @@ __PACKAGE__->register_method ({
my $cfg = PVE::Storage::config();
my ($node, $storage) = $param->@{qw(node storage)};
- my $scfg = PVE::Storage::storage_check_enabled($cfg, $storage, $node);
+ my $scfg = PVE::Storage::storage_config($cfg, $storage);
die "can't upload to storage type '$scfg->{type}'\n"
if !defined($scfg->{path});
@@ -485,8 +485,7 @@ __PACKAGE__->register_method ({
raise_param_exc({ content => "upload content type '$content' not allowed" });
}
- die "storage '$storage' does not support '$content' content\n"
- if !$scfg->{content}->{$content};
+ PVE::Storage::assert_content_type_available($cfg, $storage, $content, $node);
my $dest = "$path/$filename";
my $dirname = dirname($dest);
@@ -663,15 +662,14 @@ __PACKAGE__->register_method({
my $cfg = PVE::Storage::config();
my ($node, $storage, $compression) = $param->@{qw(node storage compression)};
- my $scfg = PVE::Storage::storage_check_enabled($cfg, $storage, $node);
+ my $scfg = PVE::Storage::storage_config($cfg, $storage);
die "can't upload to storage type '$scfg->{type}', not a file based storage!\n"
if !defined($scfg->{path});
my ($content, $url) = $param->@{'content', 'url'};
- die "storage '$storage' is not configured for content-type '$content'\n"
- if !$scfg->{content}->{$content};
+ PVE::Storage::assert_content_type_available($cfg, $storage, $content, $node);
my $filename = PVE::Storage::normalize_content_filename($param->{filename});
diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm
index b5a2c8a..eea51e9 100755
--- a/src/PVE/Storage.pm
+++ b/src/PVE/Storage.pm
@@ -1842,7 +1842,8 @@ sub prune_backups {
my ($cfg, $storeid, $keep, $vmid, $type, $dryrun, $logfunc) = @_;
my $scfg = storage_config($cfg, $storeid);
- die "storage '$storeid' does not support backups\n" if !$scfg->{content}->{backup};
+
+ PVE::Storage::assert_content_type_available($cfg, $storeid, 'backup');
if (!defined($keep)) {
die "no prune-backups options configured for storage '$storeid'\n"
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel