Merge pull request #1136 from jcmoraisjr/jm-pid-group

Move embedded haproxy process to a distinct pid group
jcmoraisjr · Jun 13, 2024 · d0deb9d · d0deb9d
2 parents dfeb920 + d8bc567
commit d0deb9d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -44,4 +44,7 @@ RUN mkdir -p /var/empty /etc/haproxy /var/lib/haproxy /var/run/haproxy\
 
 STOPSIGNAL SIGTERM
 USER haproxy
+
+# dumb-init reaps the old haproxy process in the embedded, non master-worker mode,
+# after receiving SIGUSR1, avoiding it to become a zombie.
 ENTRYPOINT ["/usr/bin/dumb-init", "--", "/start.sh"]
diff --git a/pkg/haproxy/instance.go b/pkg/haproxy/instance.go
@@ -637,6 +637,7 @@ func (i *instance) startHAProxySync() {
 		"-f", i.options.HAProxyCfgDir)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
+	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 	if err := cmd.Start(); err != nil {
 		i.logger.Error("error starting haproxy: %v", err)
 		return

diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
@@ -27,4 +27,7 @@ RUN mkdir -p /var/empty /etc/haproxy /var/lib/haproxy /var/run/haproxy\
 
 STOPSIGNAL SIGTERM
 USER haproxy
+
+# dumb-init reaps the old haproxy process in the embedded, non master-worker mode,
+# after receiving SIGUSR1, avoiding it to become a zombie.
 ENTRYPOINT ["/usr/bin/dumb-init", "--", "/start.sh"]