From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: [pve-devel] applied: [PATCH v2 manager 1/2] pve6to7: content check: fix detecting pass
Date: Wed, 30 Jun 2021 14:24:03 +0200 [thread overview]
Message-ID: <1625055691.7l7zgq143o.astroid@nora.none> (raw)
In-Reply-To: <20210630091618.28792-1-f.ebner@proxmox.com>
On June 30, 2021 11:16 am, Fabian Ebner wrote:
> If there is a log_fail, because of misconfigured 'none' content type, the final
> log_pass should not be printed.
>
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
>
> No changes from v1.
>
> PVE/CLI/pve6to7.pm | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm
> index f56dd42c..3d5b780b 100644
> --- a/PVE/CLI/pve6to7.pm
> +++ b/PVE/CLI/pve6to7.pm
> @@ -707,6 +707,7 @@ sub check_storage_content {
> log_info("Checking storage content type configuration..");
>
> my $found;
> + my $pass = 1;
>
> my $storage_cfg = PVE::Storage::config();
>
> @@ -718,6 +719,7 @@ sub check_storage_content {
> my $valid_content = PVE::Storage::Plugin::valid_content_types($scfg->{type});
>
> if (scalar(keys $scfg->{content}->%*) == 0 && !$valid_content->{none}) {
> + $pass = 0;
> log_fail("storage '$storeid' does not support configured content type 'none'");
> delete $scfg->{content}->{none}; # scan for guest images below
> }
> @@ -738,6 +740,7 @@ sub check_storage_content {
>
> if (scalar(@volumes) > 0) {
> $found = 1;
> + $pass = 0;
> log_warn("storage '$storeid' - neither content type 'images' nor 'rootdir' configured"
> .", but found guest volume(s):\n " . join("\n ", @volumes));
> }
> @@ -746,7 +749,9 @@ sub check_storage_content {
> if ($found) {
> 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 {
> + }
> +
> + if ($pass) {
> log_pass("no problems found");
> }
> }
> --
> 2.20.1
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
prev parent reply other threads:[~2021-06-30 12:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-30 9:16 [pve-devel] " Fabian Ebner
2021-06-30 9:16 ` [pve-devel] [PATCH v2 manager 2/2] pve6to7: more fine-grained detection of misconfigured guest volumes Fabian Ebner
2021-06-30 12:23 ` [pve-devel] applied: " Fabian Grünbichler
2021-06-30 12:24 ` Fabian Grünbichler [this message]
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=1625055691.7l7zgq143o.astroid@nora.none \
--to=f.gruenbichler@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