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 7E058737AA for ; Fri, 18 Jun 2021 12:59:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 50AE326B94 for ; Fri, 18 Jun 2021 12:59:45 +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 id AABF826B72 for ; Fri, 18 Jun 2021 12:59:42 +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 78D8B44266 for ; Fri, 18 Jun 2021 12:59:42 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 18 Jun 2021 12:59:30 +0200 Message-Id: <20210618105938.57107-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210618105938.57107-1-f.ebner@proxmox.com> References: <20210618105938.57107-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.731 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lxc.pm, migrate.pm] Subject: [pve-devel] [PATCH container 1/3] prefer storage_check_enabled over storage_check_node 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: Fri, 18 Jun 2021 10:59:45 -0000 storage_check_enabled simply checks for the 'disable' option and then calls storage_check_node. While not strictly necessary for a second call where only the storage differs, it is more future-proof: if support for a target storage is added at some point, it might be easy to miss adapting the call. For the migration checks, disabled storages are now always caught. Signed-off-by: Fabian Ebner --- src/PVE/API2/LXC.pm | 4 ++-- src/PVE/LXC/Migrate.pm | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index 936debb..5977b2d 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -275,7 +275,7 @@ __PACKAGE__->register_method({ my $check_and_activate_storage = sub { my ($sid) = @_; - my $scfg = PVE::Storage::storage_check_node($storage_cfg, $sid, $node); + my $scfg = PVE::Storage::storage_check_enabled($storage_cfg, $sid, $node); raise_param_exc({ storage => "storage '$sid' does not support container directories"}) if !$scfg->{content}->{rootdir}; @@ -1378,7 +1378,7 @@ __PACKAGE__->register_method({ PVE::Storage::storage_check_enabled($storecfg, $storage); if ($target) { # check if storage is available on target node - PVE::Storage::storage_check_node($storecfg, $storage, $target); + PVE::Storage::storage_check_enabled($storecfg, $storage, $target); # clone only works if target storage is shared my $scfg = PVE::Storage::storage_config($storecfg, $storage); die "can't clone to non-shared storage '$storage'\n" if !$scfg->{shared}; diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm index b5917e9..95c5799 100644 --- a/src/PVE/LXC/Migrate.pm +++ b/src/PVE/LXC/Migrate.pm @@ -63,8 +63,8 @@ sub prepare { die "can't determine assigned storage for mount point '$ms'\n" if !$storage; # check if storage is available on both nodes - my $scfg = PVE::Storage::storage_check_node($self->{storecfg}, $storage); - PVE::Storage::storage_check_node($self->{storecfg}, $storage, $self->{node}); + my $scfg = PVE::Storage::storage_check_enabled($self->{storecfg}, $storage); + PVE::Storage::storage_check_enabled($self->{storecfg}, $storage, $self->{node}); if ($scfg->{shared}) { @@ -134,8 +134,8 @@ sub phase1 { my ($sid, $volname) = PVE::Storage::parse_volume_id($volid); # check if storage is available on both nodes - my $scfg = PVE::Storage::storage_check_node($self->{storecfg}, $sid); - PVE::Storage::storage_check_node($self->{storecfg}, $sid, $self->{node}); + my $scfg = PVE::Storage::storage_check_enabled($self->{storecfg}, $sid); + PVE::Storage::storage_check_enabled($self->{storecfg}, $sid, $self->{node}); if ($scfg->{shared}) { $self->log('info', "volume '$volid' is on shared storage '$sid'") @@ -192,7 +192,7 @@ sub phase1 { next if @{$dl->{$storeid}} == 0; # check if storage is available on target node - PVE::Storage::storage_check_node($self->{storecfg}, $storeid, $self->{node}); + PVE::Storage::storage_check_enabled($self->{storecfg}, $storeid, $self->{node}); PVE::Storage::foreach_volid($dl, sub { my ($volid, $sid, $volname) = @_; -- 2.30.2