d547f26c7d
While the mkdir option deals with the case where we don't want to clobber a mount point with directories (like ZFS, gluster or NFS), putting a directory storage directly onto a mount point is still risky: If the path exists - which it usually does even if not mounted - the storage will be considered successfully activated, but empty (or with unexpected content). Some operations will then lead to unexpected problems: the free_disk operation for instance only warns if the disk does not exist, but does not throw an error. In this case the configuration might be updated without the real disk being deleted. Once it's mounted back in, later operations which check existing disks which are not part of the current VM configuration (like migration) might error unexpectedly. This adds an 'is_mountpoint' option to directory storages which assumes the directory is an externally managed mount point (eg. fstab or zfs) and changes activate_storage() to throw an error if the path is not mounted.
117 lines
2.8 KiB
Perl
117 lines
2.8 KiB
Perl
package PVE::Storage::DirPlugin;
|
|
|
|
use strict;
|
|
use warnings;
|
|
use Cwd;
|
|
use File::Path;
|
|
use PVE::Storage::Plugin;
|
|
use PVE::JSONSchema qw(get_standard_option);
|
|
|
|
use base qw(PVE::Storage::Plugin);
|
|
|
|
# Configuration
|
|
|
|
sub type {
|
|
return 'dir';
|
|
}
|
|
|
|
sub plugindata {
|
|
return {
|
|
content => [ { images => 1, rootdir => 1, vztmpl => 1, iso => 1, backup => 1, none => 1 },
|
|
{ images => 1, rootdir => 1 }],
|
|
format => [ { raw => 1, qcow2 => 1, vmdk => 1, subvol => 1 } , 'raw' ],
|
|
};
|
|
}
|
|
|
|
sub properties {
|
|
return {
|
|
path => {
|
|
description => "File system path.",
|
|
type => 'string', format => 'pve-storage-path',
|
|
},
|
|
mkdir => {
|
|
description => "Create the directory if it doesn't exist.",
|
|
type => 'boolean',
|
|
default => 'yes',
|
|
},
|
|
is_mountpoint => {
|
|
description =>
|
|
"Assume the directory is an externally managed mountpoint. " .
|
|
"If nothing is mounted the storage will be considered offline.",
|
|
type => 'boolean',
|
|
default => 'no',
|
|
},
|
|
};
|
|
}
|
|
|
|
sub options {
|
|
return {
|
|
path => { fixed => 1 },
|
|
nodes => { optional => 1 },
|
|
shared => { optional => 1 },
|
|
disable => { optional => 1 },
|
|
maxfiles => { optional => 1 },
|
|
content => { optional => 1 },
|
|
format => { optional => 1 },
|
|
mkdir => { optional => 1 },
|
|
is_mountpoint => { optional => 1 },
|
|
};
|
|
}
|
|
|
|
# Storage implementation
|
|
#
|
|
|
|
# NOTE: should ProcFSTools::is_mounted accept an optional cache like this?
|
|
sub path_is_mounted {
|
|
my ($mountpoint, $mountdata) = @_;
|
|
|
|
$mountpoint = Cwd::realpath($mountpoint); # symlinks
|
|
return 0 if !defined($mountpoint); # path does not exist
|
|
|
|
$mountdata = PVE::ProcFSTools::parse_proc_mounts() if !$mountdata;
|
|
return 1 if grep { $_->[1] eq $mountpoint } @$mountdata;
|
|
return undef;
|
|
}
|
|
|
|
sub status {
|
|
my ($class, $storeid, $scfg, $cache) = @_;
|
|
|
|
$cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
|
|
if !$cache->{mountdata};
|
|
|
|
my $path = $scfg->{path};
|
|
|
|
return undef if !path_is_mounted($path, $cache->{mountdata});
|
|
|
|
return $class->SUPER::status($storeid, $scfg, $cache);
|
|
}
|
|
|
|
|
|
sub activate_storage {
|
|
my ($class, $storeid, $scfg, $cache) = @_;
|
|
|
|
my $path = $scfg->{path};
|
|
if (!defined($scfg->{mkdir}) || $scfg->{mkdir}) {
|
|
mkpath $path;
|
|
}
|
|
|
|
if ($scfg->{is_mountpoint} && !path_is_mounted($path, $cache->{mountdata})) {
|
|
die "unable to activate storage '$storeid' - " .
|
|
"directory is expected to be a mount point but is not mounted: '$path'\n";
|
|
}
|
|
|
|
$class->SUPER::activate_storage($storeid, $scfg, $cache);
|
|
}
|
|
|
|
sub check_config {
|
|
my ($self, $sectionId, $config, $create, $skipSchemaCheck) = @_;
|
|
my $opts = PVE::SectionConfig::check_config($self, $sectionId, $config, $create, $skipSchemaCheck);
|
|
return $opts if !$create;
|
|
if ($opts->{path} !~ m@^/[-/a-zA-Z0-9_.]+$@) {
|
|
die "illegal path for directory storage: $opts->{path}\n";
|
|
}
|
|
return $opts;
|
|
}
|
|
|
|
1;
|