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 1DC9661133 for ; Wed, 16 Dec 2020 12:59:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 080621BB07 for ; Wed, 16 Dec 2020 12:59:10 +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 E07FE1BAFD for ; Wed, 16 Dec 2020 12:59:08 +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 A898543EC4 for ; Wed, 16 Dec 2020 12:59:08 +0100 (CET) From: Alwin Antreich To: pve-devel@lists.proxmox.com Date: Wed, 16 Dec 2020 12:59:04 +0100 Message-Id: <20201216115904.2790788-1-a.antreich@proxmox.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 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 storage] fix: check connection for nfs v4 only server 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, 16 Dec 2020 11:59:40 -0000 the check_connection is done by querying the exports of the nfs server in question. With nfs v4 those exports aren't listed anymore since nfs v4 employs a pseudo-filesystem starting from root (/). rpcinfo allows to query the existence of an nfs v4 service. Signed-off-by: Alwin Antreich --- Note: scan_nfs will not work with nfs v4 only, since it also employs showmount. The path has to be provided manually. PVE/Storage/NFSPlugin.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/PVE/Storage/NFSPlugin.pm b/PVE/Storage/NFSPlugin.pm index e8e27c0..72e06c2 100644 --- a/PVE/Storage/NFSPlugin.pm +++ b/PVE/Storage/NFSPlugin.pm @@ -160,8 +160,16 @@ sub check_connection { my ($class, $storeid, $scfg) = @_; my $server = $scfg->{server}; - - my $cmd = ['/sbin/showmount', '--no-headers', '--exports', $server]; + my $opts = $scfg->{options}; + + my $cmd; + if (defined($opts) && $opts =~ /vers=4.*/) { + # nfsv4 uses a pseudo-filesystem always beginning with / + # no exports are listed + $cmd = ['/usr/sbin/rpcinfo', '-t', $server, 'nfs', '4']; + } else { + $cmd = ['/sbin/showmount', '--no-headers', '--exports', $server]; + } eval { run_command($cmd, timeout => 10, outfunc => sub {}, errfunc => sub {}) }; if (my $err = $@) { -- 2.27.0