public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 4/5] pve6to7: dont guard noout check on Ceph version
Date: Tue,  6 Jul 2021 14:13:47 +0200	[thread overview]
Message-ID: <20210706121348.3505015-5-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20210706121348.3505015-1-f.gruenbichler@proxmox.com>

we don't have a mandatory Ceph major version upgrade this time around,
so this check does not make sense. instead, we want noout until the full
cluster is upgraded. let's use the simple approach and just flip the
switch to "turn off noout if all of Ceph is a single version" in the PVE
7.x branch.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---

Notes:
    next patch sets it for the stable-6 branch

 PVE/CLI/pve6to7.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm
index 00f922bb..36e6676f 100644
--- a/PVE/CLI/pve6to7.pm
+++ b/PVE/CLI/pve6to7.pm
@@ -447,9 +447,7 @@ sub check_ceph {
 	    log_warn("unable to determine overall Ceph daemon versions!");
 	} elsif (keys %$overall_versions == 1) {
 	    log_pass("single running overall version detected for all Ceph daemon types.");
-	    if ((keys %$overall_versions)[0] =~ /^ceph version 15\./) {
-		$noout_wanted = 0;
-	    }
+	    $noout_wanted = 0; # off post-upgrade, on pre-upgrade
 	} else {
 	    log_warn("overall version mismatch detected, check 'ceph versions' output for details!");
 	}
-- 
2.30.2





  parent reply	other threads:[~2021-07-06 12:14 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-06 12:13 [pve-devel] [PATCH manager 0/5] pve6to7 ceph fixes Fabian Grünbichler
2021-07-06 12:13 ` [pve-devel] [PATCH manager 1/5] pve6to7: use new flags API Fabian Grünbichler
2021-07-06 12:13 ` [pve-devel] [PATCH manager 2/5] pve6to7: remove PASS noise for ceph Fabian Grünbichler
2021-07-06 12:13 ` [pve-devel] [PATCH manager 3/5] pve6to7: check for >= Octopus Fabian Grünbichler
2021-07-06 12:13 ` Fabian Grünbichler [this message]
2021-07-06 12:13 ` [pve-devel] [PATCH stable-6 manager 5/5] pve6to7: enable noout before upgrade Fabian Grünbichler
2021-07-06 12:53 ` [pve-devel] applied-series: [PATCH manager 0/5] pve6to7 ceph fixes Thomas Lamprecht

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=20210706121348.3505015-5-f.gruenbichler@proxmox.com \
    --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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal