[pve-devel] [PATCH manager 2/2] pve6to7: drop PASS for Luminous -> Nautilus check

Fabian Grünbichler f.gruenbichler at proxmox.com
Thu Jul 1 09:58:57 CEST 2021


this should pass on pretty much every system running hyper converged
Ceph on PVE 6.x ..

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

Notes:
    there are for sure more things to adapt w.r.t. Ceph..

 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 899ef6c6..5208c170 100644
--- a/PVE/CLI/pve6to7.pm
+++ b/PVE/CLI/pve6to7.pm
@@ -414,9 +414,7 @@ sub check_ceph {
 	if (!$osd_flags) {
 	    log_fail("unable to get Ceph OSD flags!");
 	} else {
-	    if ($osd_flags =~ m/recovery_deletes/ && $osd_flags =~ m/purged_snapdirs/) {
-		log_pass("all PGs have been scrubbed at least once while running Ceph Luminous."); # FIXME: remove?
-	    } else {
+	    if (!($osd_flags =~ m/recovery_deletes/ && $osd_flags =~ m/purged_snapdirs/)) {
 		log_fail("missing 'recovery_deletes' and/or 'purged_snapdirs' flag, scrub of all PGs required before upgrading to Nautilus!");
 	    }
 	}
-- 
2.30.2






More information about the pve-devel mailing list