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 5CBDD6C0DA for ; Fri, 19 Mar 2021 14:49:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5813A230A9 for ; Fri, 19 Mar 2021 14:49:14 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 DE09B2308A for ; Fri, 19 Mar 2021 14:49:12 +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 8C644428A8 for ; Fri, 19 Mar 2021 14:49:12 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Cc: Thomas Lamprecht Date: Fri, 19 Mar 2021 14:49:06 +0100 Message-Id: <20210319134908.10558-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [qemumigrate.pm] Subject: [pve-devel] [PATCH qemu-server 1/3] migrate: improve early error messages 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, 19 Mar 2021 13:49:44 -0000 by re-using the log_error-closure and not dying too early. In the case of unreferenced volumes, it was not clear why a certain storage would be required for migration. Now, the list of all volumes is always printed, and in the error case, all problems will be printed before we abort. Reported-by: Thomas Lamprecht Signed-off-by: Fabian Ebner --- PVE/QemuMigrate.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 5c019fc..3597cc9 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -400,12 +400,19 @@ sub sync_disks { my $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $storeid); # check if storage is available on target node - PVE::Storage::storage_check_node($storecfg, $targetsid, $self->{node}); + my $target_scfg = PVE::Storage::storage_check_node( + $storecfg, + $targetsid, + $self->{node}, + 1, + ); + + $log_error->("storage '$targetsid' is not available on node '$self->{node}'") + if !$target_scfg; # grandfather in existing mismatches - if ($targetsid ne $storeid) { - my $target_scfg = PVE::Storage::storage_config($storecfg, $targetsid); - die "content type 'images' is not available on storage '$targetsid'\n" + if ($targetsid ne $storeid && $target_scfg) { + $log_error->("content type 'images' is not available on storage '$targetsid'") if !$target_scfg->{content}->{images}; } -- 2.20.1