Merge pull request #819 from aaannz/healthy_notify

Notify systemd only once db and server containers are healthy (bsc#1263823)

Author: mcalmer

mgradm/shared/templates/pgsqlServiceTemplate.go

@@ -11,8 +11,8 @@ import (
 	"github.com/uyuni-project/uyuni-tools/shared/types"
 )
 
-const pgsqlServiceTemplate = `# uyuni-db-server.service, generated by mgradm
-# Use an uyuni-db-server.service.d/local.conf file to override
+const pgsqlServiceTemplate = `# uyuni-db.service, generated by mgradm
+# Use an uyuni-db.service.d/local.conf file to override
 
 [Unit]
 Description=Uyuni database container service
@@ -33,8 +33,7 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
 	--cgroups=no-conmon \
 	--shm-size=0 \
 	--shm-size-systemd=0 \
-	--sdnotify=conmon \
-	-d \
+	--sdnotify=healthy \
 	--name {{ .NamePrefix }}-db \
 	--hostname {{ .NamePrefix }}-db.mgr.internal \
 	--network-alias db \
@@ -68,7 +67,8 @@ ExecStopPost=/usr/bin/podman rm \
 PIDFile=%t/%n.pid
 TimeoutStopSec=180
 TimeoutStartSec=900
-Type=forking
+Type=notify
+NotifyAccess=all
 
 [Install]
 WantedBy=multi-user.target default.target

mgradm/shared/templates/serviceTemplate.go

@@ -31,9 +31,8 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
 	--cgroups=no-conmon \
 	--shm-size=0 \
 	--shm-size-systemd=0 \
-	--sdnotify=conmon \
+	--sdnotify=healthy \
 	--systemd=always \
-	-d \
 	--name {{ .NamePrefix }}-server \
 	--hostname {{ .NamePrefix }}-server.mgr.internal \
 	{{ .Args }} \
@@ -87,7 +86,8 @@ ExecStopPost=/usr/bin/podman rm \
 PIDFile=%t/uyuni-server.pid
 TimeoutStopSec=180
 TimeoutStartSec=900
-Type=forking
+Type=notify
+NotifyAccess=all
 
 [Install]
 WantedBy=multi-user.target default.target

mgradm/shared/templates/templates_test.go

@@ -115,9 +115,8 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
 	--cgroups=no-conmon \
 	--shm-size=0 \
 	--shm-size-systemd=0 \
-	--sdnotify=conmon \
+	--sdnotify=healthy \
 	--systemd=always \
-	-d \
 	--name uyuni-server \
 	--hostname uyuni-server.mgr.internal \
 	--arg value \
@@ -159,7 +158,8 @@ ExecStopPost=/usr/bin/podman rm \
 PIDFile=%t/uyuni-server.pid
 TimeoutStopSec=180
 TimeoutStartSec=900
-Type=forking
+Type=notify
+NotifyAccess=all
 
 [Install]
 WantedBy=multi-user.target default.target
@@ -203,9 +203,8 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
 	--cgroups=no-conmon \
 	--shm-size=0 \
 	--shm-size-systemd=0 \
-	--sdnotify=conmon \
+	--sdnotify=healthy \
 	--systemd=always \
-	-d \
 	--name uyuni-server \
 	--hostname uyuni-server.mgr.internal \
 	--arg value \
@@ -239,7 +238,8 @@ ExecStopPost=/usr/bin/podman rm \
 PIDFile=%t/uyuni-server.pid
 TimeoutStopSec=180
 TimeoutStartSec=900
-Type=forking
+Type=notify
+NotifyAccess=all
 
 [Install]
 WantedBy=multi-user.target default.target

uyuni-tools.changes.oholecek.healthy_notify

@@ -0,0 +1,3 @@
+- Require at least podman v4.7.2
+- Send READY notification to systemd only once healthy
+  (bsc#1263823)

uyuni-tools.spec

@@ -116,7 +116,7 @@ Requires:       (netavark if podman)
 Requires:       openssl
 # suse_version
 %if "%{_vendor}" != "debbuild"
-Requires:       (podman >= 4.5.0 if podman)
+Requires:       (podman >= 4.7.2 if podman)
 %endif
 
 %description -n %{name_adm}