diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-24 07:49:29 -0400 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-08-20 14:30:06 +0200 |
| commit | 5fc7c880a9852fdb4d05ab1582f318f43b6e58ea (patch) | |
| tree | 39c749107504e7fecf6eb7f61c2de9eeaff4ac70 /test | |
| parent | 651fbacc35b8fcd2b170357548c1f6272ae2c48b (diff) | |
| download | podman-5fc7c880a9852fdb4d05ab1582f318f43b6e58ea.tar.gz podman-5fc7c880a9852fdb4d05ab1582f318f43b6e58ea.tar.bz2 podman-5fc7c880a9852fdb4d05ab1582f318f43b6e58ea.zip | |
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.
Backport of commit c22f3e8b4e25.
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/system/260-sdnotify.bats | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/system/260-sdnotify.bats b/test/system/260-sdnotify.bats index acb30de47..b5d3f9b86 100644 --- a/test/system/260-sdnotify.bats +++ b/test/system/260-sdnotify.bats @@ -130,6 +130,8 @@ function _assert_mainpid_is_conmon() { _stop_socat } +# These tests can fail in dev. environment because of SELinux. +# quick fix: chcon -t container_runtime_exec_t ./bin/podman @test "sdnotify : container" { # Sigh... we need to pull a humongous image because it has systemd-notify. # (IMPORTANT: fedora:32 and above silently removed systemd-notify; this @@ -150,7 +152,7 @@ function _assert_mainpid_is_conmon() { wait_for_ready $cid run_podman logs $cid - is "${lines[0]}" "/.*/container\.sock/notify" "NOTIFY_SOCKET is passed to container" + is "${lines[0]}" "/run/notify/notify.sock" "NOTIFY_SOCKET is passed to container" # With container, READY=1 isn't necessarily the last message received; # just look for it anywhere in received messages |