cifs: small line bloat reduction

[pve-storage.git] / PVE / Storage / NFSPlugin.pm

diff --git a/PVE/Storage/NFSPlugin.pm b/PVE/Storage/NFSPlugin.pm
index 82b0c5ffe46cf001fc335c6b854d6ab928919e6c..c2d41762c76e3a9b4b12423a2825462dc5d17562 100644 (file)
--- 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;
@@ -77,16 +79,20 @@ sub properties {
 sub options {
     return {
        path => { fixed => 1 },
+       'content-dirs' => { optional => 1 },
        server => { fixed => 1 },
        export => { fixed => 1 },
-        nodes => { optional => 1 },
+       nodes => { optional => 1 },
        disable => { optional => 1 },
-        maxfiles => { optional => 1 },
+       maxfiles => { optional => 1 },
+       'prune-backups' => { optional => 1 },
+       'max-protected-backups' => { optional => 1 },
        options => { optional => 1 },
        content => { optional => 1 },
        format => { optional => 1 },
        mkdir => { optional => 1 },
        bwlimit => { optional => 1 },
+       preallocation => { optional => 1 },
     };
 }
 
@@ -126,11 +132,8 @@ sub activate_storage {
     my $server = $scfg->{server};
     my $export = $scfg->{export};
 
-    if (!nfs_is_mounted($server, $export, $path, $cache->{mountdata})) {    
-                   
-       # NOTE: only call mkpath when not mounted (avoid hang 
-       # when NFS server is offline 
-                   
+    if (!nfs_is_mounted($server, $export, $path, $cache->{mountdata})) {
+       # NOTE: only call mkpath when not mounted (avoid hang when NFS server is offline
        mkpath $path if !(defined($scfg->{mkdir}) && !$scfg->{mkdir});
 
        die "unable to activate storage '$storeid' - " .
@@ -162,17 +165,64 @@ sub check_connection {
     my ($class, $storeid, $scfg) = @_;
 
     my $server = $scfg->{server};
+    my $opts = $scfg->{options};
 
-    my $cmd = ['/sbin/showmount', '--no-headers', '--exports', $server];
+    my $cmd;
 
-    eval {
-       run_command($cmd, timeout => 2, outfunc => sub {}, errfunc => sub {});
-    };
+    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);
+       }
+
+       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', $transport, $ip, 'nfs', '4'];
+    } else {
+       $cmd = ['/sbin/showmount', '--no-headers', '--exports', $server];
+    }
+
+    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;
     }
 
     return 1;
 }
 
+# FIXME remove on the next APIAGE reset.
+# Deprecated, use get_volume_attribute instead.
+sub get_volume_notes {
+    my $class = shift;
+    PVE::Storage::DirPlugin::get_volume_notes($class, @_);
+}
+
+# FIXME remove on the next APIAGE reset.
+# Deprecated, use update_volume_attribute instead.
+sub update_volume_notes {
+    my $class = shift;
+    PVE::Storage::DirPlugin::update_volume_notes($class, @_);
+}
+
+sub get_volume_attribute {
+    return PVE::Storage::DirPlugin::get_volume_attribute(@_);
+}
+
+sub update_volume_attribute {
+    return PVE::Storage::DirPlugin::update_volume_attribute(@_);
+}
+
 1;