Merge pull request #589 from mbussolotto/health

during upgrade, pgsql service needs to be started before healtcheck (bsc#1243402)

Author: mbussolotto

mgradm/shared/pgsql/pgsql.go

@@ -49,7 +49,7 @@ func SetupPgsql(
 	}
 	cnx := shared.NewConnection("podman", podman.DBContainerName, "")
 	if err := cnx.WaitForHealthcheck(); err != nil {
-		return err
+		return utils.Errorf(err, L("%s fails healtcheck"), podman.DBContainerName)
 	}
 
 	return nil
@@ -81,8 +81,16 @@ func Upgrade(
 		return err
 	}
 
+	if err := systemd.StartService(podman.DBService); err != nil {
+		return err
+	}
+
 	cnx := shared.NewConnection("podman", podman.DBContainerName, "")
-	return cnx.WaitForHealthcheck()
+	if err := cnx.WaitForHealthcheck(); err != nil {
+		return utils.Errorf(err, L("%s fails healtcheck"), podman.DBContainerName)
+	}
+
+	return nil
 }
 
 // GeneratePgsqlSystemdService creates the DB container systemd files.

shared/podman/systemd.go

@@ -58,6 +58,10 @@ func (s SystemdImpl) ServiceIsEnabled(name string) bool {
 // DisableService disables a service
 // name is the name of the service without the '.service' part.
 func (s SystemdImpl) DisableService(name string) error {
+	if !s.ServiceIsEnabled(name) {
+		log.Debug().Msgf("%s is already disabled.", name)
+		return nil
+	}
 	if err := utils.RunCmd("systemctl", "disable", "--now", name); err != nil {
 		return utils.Errorf(err, L("failed to disable %s systemd service"), name)
 	}
@@ -232,6 +236,10 @@ func (s SystemdImpl) StopService(service string) error {
 
 // EnableService enables and starts a systemd service.
 func (s SystemdImpl) EnableService(service string) error {
+	if s.ServiceIsEnabled(service) {
+		log.Debug().Msgf("%s is already enabled.", service)
+		return nil
+	}
 	if err := utils.RunCmd("systemctl", "enable", "--now", service); err != nil {
 		return utils.Errorf(err, L("failed to enable %s systemd service"), service)
 	}

uyuni-tools.changes.mbussolotto.health

@@ -0,0 +1 @@
+- during upgrade, pgsql service needs to be started before healtcheck (bsc#1243402)