sub options {
return {
path => { fixed => 1 },
+ 'content-dirs' => { optional => 1 },
server => { fixed => 1 },
export => { fixed => 1 },
nodes => { optional => 1 },
disable => { 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 },
};
}
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);
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;