X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FStorage%2FNFSPlugin.pm;h=21b288a239f3c3a50c5301c2bd51c9329703a7dd;hb=e0aa2070f61c953f326f9205fd107f9d6ed12718;hp=14aa4ed2bc4ad35b480ca66895ac86aae44b87c1;hpb=da63f588326a68f6e46261a65638c786ba414f01;p=pve-storage.git

diff --git a/PVE/Storage/NFSPlugin.pm b/PVE/Storage/NFSPlugin.pm
index 14aa4ed..21b288a 100644
--- a/PVE/Storage/NFSPlugin.pm
+++ b/PVE/Storage/NFSPlugin.pm
@@ -5,7 +5,10 @@ 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;
 use PVE::JSONSchema qw(get_standard_option);
 
@@ -13,31 +16,18 @@ use base qw(PVE::Storage::Plugin);
 
 # NFS helper functions
 
-sub read_proc_mounts {
-    
-    local $/; # enable slurp mode
-    
-    my $data = "";
-    if (my $fd = IO::File->new("/proc/mounts", "r")) {
-	$data = <$fd>;
-	close ($fd);
-    }
-
-    return $data;
-}
-
 sub nfs_is_mounted {
     my ($server, $export, $mountpoint, $mountdata) = @_;
 
     $server = "[$server]" if Net::IP::ip_is_ipv6($server);
     my $source = "$server:$export";
 
-    $mountdata = read_proc_mounts() if !$mountdata;
-
-    if ($mountdata =~ m|^\Q$source\E/?\s\Q$mountpoint\E\snfs|m) {
-	return $mountpoint;
-    } 
-
+    $mountdata = PVE::ProcFSTools::parse_proc_mounts() if !$mountdata;
+    return $mountpoint if grep {
+	$_->[2] =~ /^nfs/ &&
+	$_->[0] =~ m|^\Q$source\E/?$| &&
+	$_->[1] eq $mountpoint
+    } @$mountdata;
     return undef;
 }
 
@@ -63,7 +53,7 @@ sub type {
 
 sub plugindata {
     return {
-	content => [ { images => 1, rootdir => 1, vztmpl => 1, iso => 1, backup => 1},
+	content => [ { images => 1, rootdir => 1, vztmpl => 1, iso => 1, backup => 1, snippets => 1 },
 		     { images => 1 }],
 	format => [ { raw => 1, qcow2 => 1, vmdk => 1 } , 'raw' ],
     };
@@ -91,12 +81,16 @@ sub options {
 	path => { fixed => 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 },
 	options => { optional => 1 },
 	content => { optional => 1 },
 	format => { optional => 1 },
+	mkdir => { optional => 1 },
+	bwlimit => { optional => 1 },
+	preallocation => { optional => 1 },
     };
 }
 
@@ -114,7 +108,8 @@ sub check_config {
 sub status {
     my ($class, $storeid, $scfg, $cache) = @_;
 
-    $cache->{mountdata} = read_proc_mounts() if !$cache->{mountdata};
+    $cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
+	if !$cache->{mountdata};
 
     my $path = $scfg->{path};
     my $server = $scfg->{server};
@@ -128,18 +123,16 @@ sub status {
 sub activate_storage {
     my ($class, $storeid, $scfg, $cache) = @_;
 
-    $cache->{mountdata} = read_proc_mounts() if !$cache->{mountdata};
+    $cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
+	if !$cache->{mountdata};
 
     my $path = $scfg->{path};
     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 
-		    
-	mkpath $path;
+    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' - " .
 	    "directory '$path' does not exist\n" if ! -d $path;
@@ -153,7 +146,8 @@ sub activate_storage {
 sub deactivate_storage {
     my ($class, $storeid, $scfg, $cache) = @_;
 
-    $cache->{mountdata} = read_proc_mounts() if !$cache->{mountdata};
+    $cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
+	if !$cache->{mountdata};
 
     my $path = $scfg->{path};
     my $server = $scfg->{server};
@@ -169,13 +163,25 @@ sub check_connection {
     my ($class, $storeid, $scfg) = @_;
 
     my $server = $scfg->{server};
+    my $opts = $scfg->{options};
+
+    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', $transport, $ip, 'nfs', '4'];
+    } else {
+	$cmd = ['/sbin/showmount', '--no-headers', '--exports', $server];
+    }
 
-    # test connection to portmapper
-    my $cmd = ['/usr/sbin/rpcinfo', '-p', $server];
-
-    eval {
-	run_command($cmd, timeout => 2, outfunc => sub {}, errfunc => sub {});
-    };
+    eval { run_command($cmd, timeout => 10, outfunc => sub {}, errfunc => sub {}) };
     if (my $err = $@) {
 	return 0;
     }
@@ -183,4 +189,13 @@ sub check_connection {
     return 1;
 }
 
+sub get_volume_notes {
+    my $class = shift;
+    PVE::Storage::DirPlugin::get_volume_notes($class, @_);
+}
+sub update_volume_notes {
+    my $class = shift;
+    PVE::Storage::DirPlugin::update_volume_notes($class, @_);
+}
+
 1;