mirror of
git://git.proxmox.com/git/pve-storage.git
synced 2024-12-22 13:34:16 +03:00
fix #4785: avoid overly noisy mkdir deprecation warning for now
Move the warning over to creating and updating storage configs, which is much less noisy as the constantly called activate storage (e.g., pvestatd). Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
09f1f847ae
commit
c61e609eb6
@ -256,6 +256,11 @@ __PACKAGE__->register_method ({
|
|||||||
|
|
||||||
$returned_config = $plugin->on_add_hook($storeid, $opts, %$sensitive);
|
$returned_config = $plugin->on_add_hook($storeid, $opts, %$sensitive);
|
||||||
|
|
||||||
|
if (defined($opts->{mkdir})) { # TODO: remove complete option in Proxmox VE 9
|
||||||
|
warn "NOTE: The 'mkdir' option set for '${storeid}' is deprecated and will be removed"
|
||||||
|
." in Proxmox VE 9. Use 'create-base-path' or 'create-subdirs' instead.\n"
|
||||||
|
}
|
||||||
|
|
||||||
eval {
|
eval {
|
||||||
# try to activate if enabled on local node,
|
# try to activate if enabled on local node,
|
||||||
# we only do this to detect errors/problems sooner
|
# we only do this to detect errors/problems sooner
|
||||||
@ -363,6 +368,11 @@ __PACKAGE__->register_method ({
|
|||||||
$scfg->{$k} = $opts->{$k};
|
$scfg->{$k} = $opts->{$k};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (defined($scfg->{mkdir})) { # TODO: remove complete option in Proxmox VE 9
|
||||||
|
warn "NOTE: The 'mkdir' option set for '${storeid}' is deprecated and will be removed"
|
||||||
|
." in Proxmox VE 9. Use 'create-base-path' or 'create-subdirs' instead.\n"
|
||||||
|
}
|
||||||
|
|
||||||
PVE::Storage::write_config($cfg);
|
PVE::Storage::write_config($cfg);
|
||||||
|
|
||||||
}, "update storage failed");
|
}, "update storage failed");
|
||||||
|
@ -1369,8 +1369,8 @@ sub activate_storage {
|
|||||||
"directory '$path' does not exist or is unreachable\n";
|
"directory '$path' does not exist or is unreachable\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
warn "${storeid}: 'mkdir' option is deprecated. Use 'create-base-path' or 'create-subdirs' instead.\n"
|
# TODO: mkdir is basically deprecated since 8.0, but we don't warn here until 8.4 or 9.0, as we
|
||||||
if defined($scfg->{mkdir});
|
# only got the replacement in 8.0, so no real replacement window, and its really noisy.
|
||||||
|
|
||||||
if (defined($scfg->{content})) {
|
if (defined($scfg->{content})) {
|
||||||
# (opt-out) create content dirs and check validity
|
# (opt-out) create content dirs and check validity
|
||||||
|
Loading…
Reference in New Issue
Block a user