From c22f3e8b4e2593ca81d08924889f7e7251c83089 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 24 Mar 2021 07:49:29 -0400 Subject: Implement SD-NOTIFY proxy in conmon This leverages conmon's ability to proxy the SD-NOTIFY socket. This prevents locking caused by OCI runtime blocking, waiting for SD-NOTIFY messages, and instead passes the messages directly up to the host. NOTE: Also re-enable the auto-update tests which has been disabled due to flakiness. With this change, Podman properly integrates into systemd. Fixes: #7316 Signed-off-by: Joseph Gooch Signed-off-by: Daniel J Walsh Signed-off-by: Valentin Rothberg --- libpod/container.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libpod/container.go') diff --git a/libpod/container.go b/libpod/container.go index 80fd35c09..c57250d72 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -126,6 +126,10 @@ type Container struct { // This is true if a container is restored from a checkpoint. restoreFromCheckpoint bool + // Used to query the NOTIFY_SOCKET once along with setting up + // mounts etc. + notifySocket string + slirp4netnsSubnet *net.IPNet } -- cgit v1.2.3-54-g00ecf