* [pve-devel] [PATCH v2 storage] fix #3348: NFS: select correct transport to check for service
@ 2021-03-17 12:49 Fabian Ebner
2021-03-31 8:26 ` [pve-devel] applied: " Thomas Lamprecht
0 siblings, 1 reply; 2+ messages in thread
From: Fabian Ebner @ 2021-03-17 12:49 UTC (permalink / raw)
To: pve-devel; +Cc: Thomas Lamprecht
Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-31 8:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-17 12:49 [pve-devel] [PATCH v2 storage] fix #3348: NFS: select correct transport to check for service Fabian Ebner
2021-03-31 8:26 ` [pve-devel] applied: " Thomas Lamprecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox