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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DA5B7960CF for ; Mon, 23 Jan 2023 10:14:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 999D02469A for ; Mon, 23 Jan 2023 10:14: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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 23 Jan 2023 10:14: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 6694D45C8A for ; Mon, 23 Jan 2023 10:14:54 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 23 Jan 2023 10:14:50 +0100 Message-Id: <20230123091450.58359-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 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 RCVD_IN_DNSWL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to DNSWL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. 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, proxmox.com] Subject: [pve-devel] [PATCH storage] nfs: check connection: support NFSv4-only servers without rpcbind 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: Mon, 23 Jan 2023 09:14:55 -0000 by simply doing a ping with the expected port as a fallback when the rpcinfo command fails. The timeout was chosen to be 2 seconds, because that's what the existing callers of tcp_ping() in the iSCSI and GlusterFS plugins use. Alternatively, the existing check could be replaced, but that would 1. Dumb down the check. 2. Risk breakage in some corner case that's yet to be discovered. 3. It would still be necessary to use rpcinfo (or dumb the check down even further) in case port=0; from 'man 5 nfs' about the NFSv4 'port' option: > If the specified port value is 0, then the NFS client uses the NFS > service port number advertised by the server's rpcbind service. Reported in the community forum: https://forum.proxmox.com/threads/118466/post-524449 https://forum.proxmox.com/threads/120774/ Signed-off-by: Fiona Ebner --- PVE/Storage/NFSPlugin.pm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/PVE/Storage/NFSPlugin.pm b/PVE/Storage/NFSPlugin.pm index 0bdde84..c2d4176 100644 --- a/PVE/Storage/NFSPlugin.pm +++ b/PVE/Storage/NFSPlugin.pm @@ -168,7 +168,9 @@ sub check_connection { my $opts = $scfg->{options}; my $cmd; - if (defined($opts) && $opts =~ /vers=4.*/) { + + my $is_v4 = defined($opts) && $opts =~ /vers=4.*/; + if ($is_v4) { my $ip = PVE::JSONSchema::pve_verify_ip($server, 1); if (!defined($ip)) { $ip = PVE::Network::get_ip_from_hostname($server); @@ -185,6 +187,16 @@ sub check_connection { eval { run_command($cmd, timeout => 10, outfunc => sub {}, errfunc => sub {}) }; if (my $err = $@) { + if ($is_v4) { + my $port = 2049; + $port = $1 if defined($opts) && $opts =~ /port=(\d+)/; + + # rpcinfo is expected to work when the port is 0 (see 'man 5 nfs') and tcp_ping() + # defaults to port 7 when passing in 0. + return 0 if $port == 0; + + return PVE::Network::tcp_ping($server, $port, 2); + } return 0; } -- 2.30.2