yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dir: allow a path as is_mountpoint value

Browse Source 
This turns is_mountpoint more into export(5)'s `mountpoint`
property.
Given the directory storage with the properties:

    path /a/b/c
    is_mountpoint $value

$value = yes
    Same as before, /a/b/c must be mounted.
$value = no (or not set)
    Same as before, no effect.
$value = /a/b
    New: /a/b must be mounted (as opposed to /a/b/c)
This commit is contained in:
Wolfgang Bumiller
2017-07-28 09:52:43 +02:00
committed by Fabian Grünbichler
parent 5a2eba91dc
commit de8eff4d31
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
PVE/Storage/DirPlugin.pm
View File

@ -36,9 +36,10 @@ sub properties {
}, },
is_mountpoint => { is_mountpoint => {
description => description =>
"Assume the directory is an externally managed mountpoint. " . "Assume the given path is an externally managed mountpoint " .
"If nothing is mounted the storage will be considered offline.", "and consider the storage offline if it is not mounted. ".
type => 'boolean', "Using a boolean (yes/no) value serves as a shortcut to using the target path in this field.",
type => 'string',
default => 'no', default => 'no',
}, },
}; };
@ -73,16 +74,24 @@ sub path_is_mounted {
return undef; return undef;
} }
sub parse_is_mountpoint {
my ($scfg) = @_;
my $is_mp = $scfg->{is_mountpoint};
return undef if !defined $is_mp;
if (defined(my $bool = PVE::JSONSchema::parse_boolean($is_mp))) {
return $bool ? $scfg->{path} : undef;
}
return $is_mp; # contains a path
}
sub status { sub status {
my ($class, $storeid, $scfg, $cache) = @_; my ($class, $storeid, $scfg, $cache) = @_;
if ($scfg->{is_mountpoint}) { if (defined(my $mp = parse_is_mountpoint($scfg))) {
$cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts() $cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
if !$cache->{mountdata}; if !$cache->{mountdata};
my $path = $scfg->{path}; return undef if !path_is_mounted($mp, $cache->{mountdata});
return undef if !path_is_mounted($path, $cache->{mountdata});
} }
return $class->SUPER::status($storeid, $scfg, $cache); return $class->SUPER::status($storeid, $scfg, $cache);
@ -97,9 +106,10 @@ sub activate_storage {
mkpath $path; mkpath $path;
} }
if ($scfg->{is_mountpoint} && !path_is_mounted($path, $cache->{mountdata})) { my $mp = parse_is_mountpoint($scfg);
if (defined($mp) && !path_is_mounted($mp, $cache->{mountdata})) {
die "unable to activate storage '$storeid' - " . die "unable to activate storage '$storeid' - " .
"directory is expected to be a mount point but is not mounted: '$path'\n"; "directory is expected to be a mount point but is not mounted: '$mp'\n";
} }
$class->SUPER::activate_storage($storeid, $scfg, $cache); $class->SUPER::activate_storage($storeid, $scfg, $cache);