From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 manager 2/2] pve6to7: check for misconfigured content type 'none'
Date: Mon, 21 Jun 2021 16:31:40 +0200 [thread overview]
Message-ID: <20210621143140.2022-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210621143140.2022-1-f.ebner@proxmox.com>
which will be a hard error (i.e. section will be skipped when parsing) in PVE
7.0
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
Changes from v1:
* Also change message for passing the check to match with changed initial
log line
PVE/CLI/pve6to7.pm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm
index 60464861..7777aa6c 100644
--- a/PVE/CLI/pve6to7.pm
+++ b/PVE/CLI/pve6to7.pm
@@ -18,6 +18,7 @@ use PVE::JSONSchema;
use PVE::NodeConfig;
use PVE::RPCEnvironment;
use PVE::Storage;
+use PVE::Storage::Plugin;
use PVE::Tools qw(run_command split_list);
use PVE::QemuConfig;
use PVE::QemuServer;
@@ -703,7 +704,7 @@ sub check_description_lengths {
}
sub check_storage_content {
- log_info("Scanning for guest images on storages without images/rootdir content type..");
+ log_info("Checking storage content type configuration..");
my $found;
@@ -714,6 +715,13 @@ sub check_storage_content {
next if !PVE::Storage::storage_check_enabled($storage_cfg, $storeid, undef, 1);
+ my $valid_content = PVE::Storage::Plugin::valid_content_types($scfg->{type});
+
+ if (scalar(keys $scfg->{content}->%*) == 0 && !$valid_content->{none}) {
+ log_fail("storage '$storeid' does not support configured content type 'none'");
+ delete $scfg->{content}->{none}; # scan for guest images below
+ }
+
next if $scfg->{content}->{images};
next if $scfg->{content}->{rootdir};
@@ -739,7 +747,7 @@ sub check_storage_content {
log_warn("PVE 7.0 enforces stricter content type checks. Guests referencing the above " .
"volumes will not work until the storage configuration is fixed.");
} else {
- log_pass("none found");
+ log_pass("no problems found");
}
}
--
2.20.1
next prev parent reply other threads:[~2021-06-21 14:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 14:31 [pve-devel] [PATCH-SERIES v2 manager] stricter storage rules for migration Fabian Ebner
2021-06-21 14:31 ` [pve-devel] [PATCH v2 manager 1/2] pve6to7: add check for guest images on misconfigured storages Fabian Ebner
2021-06-21 14:31 ` Fabian Ebner [this message]
2021-06-21 15:18 ` [pve-devel] applied-series: [PATCH-SERIES v2 manager] stricter storage rules for migration Thomas Lamprecht
2021-06-24 7:43 ` Fabian Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210621143140.2022-3-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox