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 2B5C1623D5 for ; Fri, 11 Feb 2022 11:30:25 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 20D0827CF7 for ; Fri, 11 Feb 2022 11:29:55 +0100 (CET) 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 56EA227CED for ; Fri, 11 Feb 2022 11:29:54 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3129A46DE5 for ; Fri, 11 Feb 2022 11:29:54 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 11 Feb 2022 11:29:44 +0100 Message-Id: <20220211102945.3220096-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220211102945.3220096-1-f.gruenbichler@proxmox.com> References: <20220211102945.3220096-1-f.gruenbichler@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.191 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH container 1/2] migrate: improve target storage checks 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, 11 Feb 2022 10:30:25 -0000 Signed-off-by: Fabian Grünbichler --- src/PVE/API2/LXC.pm | 2 +- src/PVE/LXC/Migrate.pm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index 37db841..84712f7 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -1162,7 +1162,7 @@ __PACKAGE__->register_method({ if (my $targetstorage = delete $param->{'target-storage'}) { my $storecfg = PVE::Storage::config(); my $storagemap = eval { PVE::JSONSchema::parse_idmap($targetstorage, 'pve-storage-id') }; - raise_param_exc({ targetstorage => "failed to parse storage map: $@" }) + raise_param_exc({ 'target-storage' => "failed to parse storage map: $@" }) if $@; $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']) diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm index c85a09c..1739c78 100644 --- a/src/PVE/LXC/Migrate.pm +++ b/src/PVE/LXC/Migrate.pm @@ -211,10 +211,10 @@ sub phase1 { # check if storage is available on target node my $targetsid = PVE::JSONSchema::map_id($self->{opts}->{storagemap}, $storeid); - PVE::Storage::storage_check_enabled($self->{storecfg}, $targetsid, $self->{node}); + my $target_scfg = PVE::Storage::storage_check_enabled($self->{storecfg}, $targetsid, $self->{node}); - die "content type 'rootdir' is not available on storage '$storeid'\n" - if !$scfg->{content}->{rootdir}; + die "content type 'rootdir' is not available on storage '$targetsid'\n" + if !$target_scfg->{content}->{rootdir}; PVE::Storage::foreach_volid($dl, sub { my ($volid, $sid, $volname) = @_; -- 2.30.2