From: Fiona Ebner <f.ebner@proxmox.com>
Date: Mon, 23 Jan 2023 09:14:50 +0000 (+0100)
Subject: nfs: check connection: support NFSv4-only servers without rpcbind
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=acff89540a8bac623978ca04317a79c5c2194f4d;p=pve-storage.git

nfs: check connection: support NFSv4-only servers without rpcbind

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 <f.ebner@proxmox.com>
---

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;
     }