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

path based storages: improve the mkdir option

Browse Source 
So far this only prevented the creation of the toplevel
directory. This does not cover all problem cases,
particularly when said directory is supposed to be a mount
point, including NFS and glusterfs beside ZFS.

The directory based storages we have already use mkpath
whenever they need to create files, and for actions on files
which are supposed to exist it's fine if it errors out.
So it should also be safe to skip the creation of standard
subdirectories in activate_storage().

Additionally NFS and glusterfs storages should also accept
the mkdir option as they otherwise may exhibit similar
issues, eg. when an NFS storage is mounted onto a directory
inside a ZFS subvolume.
This commit is contained in:
Wolfgang Bumiller
2016-08-31 10:29:08 +02:00
committed by Dietmar Maurer
parent ff3badd83f
commit c7616abcb2
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PVE/Storage/GlusterfsPlugin.pm
View File

@ -135,6 +135,7 @@ sub options {
maxfiles => { optional => 1 },
content => { optional => 1 },
format => { optional => 1 },
mkdir => { optional => 1 },
};
}
@ -272,7 +273,7 @@ sub activate_storage {
if (!glusterfs_is_mounted($volume, $path, $cache->{mountdata})) {
mkpath $path;
mkpath $path if !(defined($scfg->{mkdir}) && !$scfg->{mkdir});
die "unable to activate storage '$storeid' - " .
"directory '$path' does not exist\n" if ! -d $path;

3
PVE/Storage/NFSPlugin.pm
View File

@ -85,6 +85,7 @@ sub options {
options => { optional => 1 },
content => { optional => 1 },
format => { optional => 1 },
mkdir => { optional => 1 },
};
}
@ -129,7 +130,7 @@ sub activate_storage {
# NOTE: only call mkpath when not mounted (avoid hang
# when NFS server is offline
mkpath $path;
mkpath $path if !(defined($scfg->{mkdir}) && !$scfg->{mkdir});
die "unable to activate storage '$storeid' - " .
"directory '$path' does not exist\n" if ! -d $path;

2
PVE/Storage/Plugin.pm
View File

@ -834,6 +834,8 @@ sub activate_storage {
die "unable to activate storage '$storeid' - " .
"directory '$path' does not exist\n" if ! -d $path;
return if defined($scfg->{mkdir}) && !$scfg->{mkdir};
if (defined($scfg->{content})) {
foreach my $vtype (keys %$vtype_subdirs) {
# OpenVZMigrate uses backup (dump) dir