From: Alwin Antreich <a.antreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH storage] fix: check connection for nfs v4 only server
Date: Wed, 16 Dec 2020 12:59:04 +0100 [thread overview]
Message-ID: <20201216115904.2790788-1-a.antreich@proxmox.com> (raw)
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 <a.antreich@proxmox.com>
---
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
next reply other threads:[~2020-12-16 11:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-16 11:59 Alwin Antreich [this message]
2020-12-16 14:00 ` Alwin Antreich
2021-01-26 18:15 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201216115904.2790788-1-a.antreich@proxmox.com \
--to=a.antreich@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox