[pve-devel] [PATCH stable-7 manager] pve7to8: enable noout before upgrade

[pve-devel] [PATCH stable-7 manager] pve7to8: enable noout before upgrade

[Fiona Ebner]

Just like 3b776617 ("pve6to7: enable noout before upgrade") last time,
it should be enabled in the stable branch to ensure users see the
warning before upgrade.

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

Intended only for the stable-7 branch.

 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 73ea85b0..56af2732 100644
--- a/PVE/CLI/pve7to8.pm
+++ b/PVE/CLI/pve7to8.pm
@@ -543,7 +543,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 = 0; # off post-upgrade, on pre-upgrade
+	    $noout_wanted = 1; # 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] [PATCH manager] pve7to8: add reminder comment for noout_wanted variable

[Fiona Ebner]

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

Applies to the master branch. It's enough the have the reminder here,
stable would even need a different patch because of changed context.

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

diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
index 6b51e98e..d988c715 100644
--- a/PVE/CLI/pve7to8.pm
+++ b/PVE/CLI/pve7to8.pm
@@ -542,6 +542,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.");
+	    # TODO: needs to be set to 1 in the stable branch each time! - find better solution?
 	    $noout_wanted = 0; # 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 manager] pve7to8: enable noout before upgrade

[Thomas Lamprecht]

Am 21/06/2023 um 18:19 schrieb Fiona Ebner:
> Just like 3b776617 ("pve6to7: enable noout before upgrade") last time,
> it should be enabled in the stable branch to ensure users see the
> warning before upgrade.
> 
> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
> 
> Intended only for the stable-7 branch.
> 
>  PVE/CLI/pve7to8.pm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
>

applied, thanks!

[pve-devel] applied: [PATCH manager] pve7to8: add reminder comment for noout_wanted variable

[Thomas Lamprecht]

Am 21/06/2023 um 18:19 schrieb Fiona Ebner:
> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
> 
> Applies to the master branch. It's enough the have the reminder here,
> stable would even need a different patch because of changed context.
> 
>  PVE/CLI/pve7to8.pm | 1 +
>  1 file changed, 1 insertion(+)
> 
>

applied, thanks!