Merge branch 'main' into mlm52-gm

Author: mcalmer

mgradm/cmd/backup/db/disable.go

@@ -59,6 +59,9 @@ func Disable(flags *Flagpole) error {
 		if err := systemd.StartService(podman.DBService); err != nil {
 			return err
 		}
+		if err := cnx.WaitForHealthcheck(); err != nil {
+			return err
+		}
 	}
 	return Status()
 }

mgradm/cmd/backup/db/enable.go

@@ -58,11 +58,6 @@ func Enable(force bool) error {
 		return err
 	}
 
-	// Check if all is well configured
-	if err := CheckStatus(); err != nil {
-		return err
-	}
-
 	// Prepare initial snapshot. For this container either must be running or we need to start container database
 	log.Info().Msg(L("Starting database…"))
 	if err := systemd.StartService(podman.DBService); err != nil {
@@ -72,6 +67,11 @@ func Enable(force bool) error {
 		return err
 	}
 
+	// Check if all is well configured
+	if err := CheckStatus(); err != nil {
+		return err
+	}
+
 	if err := RunBaseBackup(cnx); err != nil {
 		return err
 	}

uyuni-tools.changes.mbussolotto.single_pg_hba_conf

@@ -1,2 +1,2 @@
-- Disable SSL on db during split (bsc#12099).
-- Do not call uyuni-postgres-config.sh in mgradm (bsc#12099).
+- Disable SSL on db during split (bsc#1267980).
+- Do not call uyuni-postgres-config.sh in mgradm (bsc#1267980).

uyuni-tools.changes.oholecek.status_check_requires_database

@@ -0,0 +1 @@
+- Check backup status only after database is started (bsc#1262492)