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 [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 326881FF16F
for <inbox@lore.proxmox.com>; Tue, 15 Apr 2025 15:52:26 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 2C746993B;
Tue, 15 Apr 2025 15:51:32 +0200 (CEST)
From: Daniel Kral <d.kral@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 15 Apr 2025 15:50:43 +0200
Message-Id: <20250415135045.255272-26-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
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 container v3 09/11] migration: prepare: use
volume content type assertion helpers
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 use of newly introduced content type assertion helpers in the
preconditions check and preparation path of the migration API handlers.
Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
changes since v2:
* rename helper from *_supported to *_available
* lower/remove storage_check_enabled to storage_config where possible
due to the helper already checking that
src/PVE/API2/LXC.pm | 7 +------
src/PVE/LXC/Migrate.pm | 14 ++++++--------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 947021a..73e1bf4 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -54,13 +54,8 @@ my sub assert_not_restore_from_external {
my $check_storage_access_migrate = sub {
my ($rpcenv, $authuser, $storecfg, $storage, $node) = @_;
- PVE::Storage::storage_check_enabled($storecfg, $storage, $node);
-
$rpcenv->check($authuser, "/storage/$storage", ['Datastore.AllocateSpace']);
-
- my $scfg = PVE::Storage::storage_config($storecfg, $storage);
- die "storage '$storage' does not support CT rootdirs\n"
- if !$scfg->{content}->{rootdir};
+ PVE::Storage::assert_content_type_available($storecfg, $storage, 'rootdir', $node);
};
__PACKAGE__->register_method ({
diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm
index f06a10a..adb8fad 100644
--- a/src/PVE/LXC/Migrate.pm
+++ b/src/PVE/LXC/Migrate.pm
@@ -72,13 +72,11 @@ sub prepare {
# check if storage is available on both nodes
my ($storecfg, $node) = $self->@{qw(storecfg node)};
- my $scfg = PVE::Storage::storage_check_enabled($storecfg, $storage);
+ my $scfg = PVE::Storage::storage_config($storecfg, $storage);
+ PVE::Storage::assert_content_type_available($storecfg, $storage, 'rootdir');
my $targetsid = $storage;
- die "content type 'rootdir' is not available on storage '$storage'\n"
- if !$scfg->{content}->{rootdir};
-
if ($scfg->{shared} && !$remote) {
# PVE::Storage::activate_storage checks this for non-shared storages
my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
@@ -93,10 +91,10 @@ sub prepare {
}
if (!$remote) {
- my $target_scfg = PVE::Storage::storage_check_enabled($storecfg, $targetsid, $node);
-
- die "$volid: content type 'rootdir' is not available on storage '$targetsid'\n"
- if !$target_scfg->{content}->{rootdir};
+ eval {
+ PVE::Storage::assert_content_type_available($storecfg, $targetsid, 'rootdir', $node)
+ };
+ die "$volid: $@" if $@;
}
$storages->{$targetsid} = 1;
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel