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 24A036B7F9 for ; Wed, 17 Mar 2021 13:50:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0EBFA2D696 for ; Wed, 17 Mar 2021 13:49:53 +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 474A62D68E for ; Wed, 17 Mar 2021 13:49:51 +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 0CFBF42695 for ; Wed, 17 Mar 2021 13:49:51 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Cc: Thomas Lamprecht Date: Wed, 17 Mar 2021 13:49:42 +0100 Message-Id: <20210317124942.14987-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. [nfsplugin.pm] Subject: [pve-devel] [PATCH v2 storage] fix #3348: NFS: select correct transport to check for service 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: Wed, 17 Mar 2021 12:50:23 -0000 Suggested-by: Thomas Lamprecht Signed-off-by: Fabian Ebner --- Changes from v1: * use existing helper functions to determine the correct transport type PVE/Storage/NFSPlugin.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/PVE/Storage/NFSPlugin.pm b/PVE/Storage/NFSPlugin.pm index cb16864..39bf15a 100644 --- a/PVE/Storage/NFSPlugin.pm +++ b/PVE/Storage/NFSPlugin.pm @@ -5,6 +5,8 @@ use warnings; use IO::File; use Net::IP; use File::Path; + +use PVE::Network; use PVE::Tools qw(run_command); use PVE::ProcFSTools; use PVE::Storage::Plugin; @@ -164,9 +166,16 @@ sub check_connection { my $cmd; if (defined($opts) && $opts =~ /vers=4.*/) { + my $ip = PVE::JSONSchema::pve_verify_ip($server, 1); + if (!defined($ip)) { + $ip = PVE::Network::get_ip_from_hostname($server); + } + + my $transport = PVE::JSONSchema::pve_verify_ipv4($ip, 1) ? 'tcp' : 'tcp6'; + # nfsv4 uses a pseudo-filesystem always beginning with / # no exports are listed - $cmd = ['/usr/sbin/rpcinfo', '-T', 'tcp', $server, 'nfs', '4']; + $cmd = ['/usr/sbin/rpcinfo', '-T', $transport, $ip, 'nfs', '4']; } else { $cmd = ['/sbin/showmount', '--no-headers', '--exports', $server]; } -- 2.20.1