[pve-devel] [PATCH stable-7+master manager] pve7to8: fix Ceph noout check

[pve-devel] [PATCH stable-7+master manager] pve7to8: fix Ceph noout check

[Fiona Ebner]

Commit 114e5f2c ("pve7to8: sync over from stable-7 branch")
accidentally got rid of the correct value 0 here and also the new TODO
message to improve the situation. But the TODO is actually easy,
because there already is the $upgraded variable. Just rely on that
instead of hard-coding and forgetting about it again.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

Should also be applied to stable-7 I guess, so the next sync doesn't
drop the change again.

 PVE/CLI/pve7to8.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
index c7d3f19c..5ba73837 100644
--- a/PVE/CLI/pve7to8.pm
+++ b/PVE/CLI/pve7to8.pm
@@ -548,7 +548,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.");
-	    $noout_wanted = 1; # off post-upgrade, on pre-upgrade
+	    $noout_wanted = !$upgraded; # off post-upgrade, on pre-upgrade
 	} elsif (keys $ceph_versions_simple->{overall}->%* != 1) {
 	    log_warn("overall version mismatch detected, check 'ceph versions' output for details!");
 	}
-- 
2.39.2

[pve-devel] applied: [PATCH stable-7+master manager] pve7to8: fix Ceph noout check

[Thomas Lamprecht]

Am 17/07/2023 um 10:38 schrieb Fiona Ebner:
> Commit 114e5f2c ("pve7to8: sync over from stable-7 branch")
> accidentally got rid of the correct value 0 here and also the new TODO
> message to improve the situation. But the TODO is actually easy,
> because there already is the $upgraded variable. Just rely on that
> instead of hard-coding and forgetting about it again.
> 
> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
> 
> Should also be applied to stable-7 I guess, so the next sync doesn't
> drop the change again.
> 
>  PVE/CLI/pve7to8.pm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
>

applied, thanks!