containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libpod API: only return exit code without conditions 

The special handling to return the exit code after the container has
been removed should only be done if there are no special conditions
requested. If a user asked for running or nay other state returning the
exit code immediately with a success response is just wrong. We only
want to allow that so the remote client can fetch the exit code without
races.

Fixes b3829a2932 ("libpod API: make wait endpoint better against rm races")

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger 2024-10-15 15:30:15 +02:00
parent 3fbae8e28e
commit 768aaadca1
No known key found for this signature in database
GPG Key ID: EB145DD938A3CAF2
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/handlers/utils/containers.go
View File

@ -137,9 +137,11 @@ func WaitContainerLibpod(w http.ResponseWriter, r *http.Request) {
// However we keep the exit code around for longer than the container so // However we keep the exit code around for longer than the container so
// we can just look it up here. Of course this only works when we get a // we can just look it up here. Of course this only works when we get a
// full id as param but podman-remote will do that // full id as param but podman-remote will do that
if code, err := runtime.GetContainerExitCode(name); err == nil { if len(opts.Conditions) == 0 {
WriteResponse(w, http.StatusOK, strconv.Itoa(int(code))) if code, err := runtime.GetContainerExitCode(name); err == nil {
return WriteResponse(w, http.StatusOK, strconv.Itoa(int(code)))
return
}
} }
ContainerNotFound(w, name, err) ContainerNotFound(w, name, err)
return return

15
test/apiv2/26-containersWait.at
View File

@ -15,6 +15,12 @@ t POST "containers/nonExistent/wait?condition=next-exit" 404
# Make sure to test a non-zero exit code (see #18889) # Make sure to test a non-zero exit code (see #18889)
podman create --name "${CTR}" "${IMAGE}" sh -c "exit 3" podman create --name "${CTR}" "${IMAGE}" sh -c "exit 3"
t GET libpod/containers/${CTR}/json 200 \
.Id~[0-9a-f]\\{64\\}
# We need the cid for the wait test at the end
cid=$(jq -r '.Id' <<<"$output")
t POST "containers/${CTR}/wait?condition=non-existent-cond" 400 t POST "containers/${CTR}/wait?condition=non-existent-cond" 400
t POST "containers/${CTR}/wait?condition=not-running" 200 t POST "containers/${CTR}/wait?condition=not-running" 200
@ -49,3 +55,12 @@ t POST "containers/${CTR}/wait?condition=removed" 200 \
# work correctly. # work correctly.
t POST "containers/${CTR}/wait?condition=next-exit" 404 t POST "containers/${CTR}/wait?condition=next-exit" 404
wait "${child_pid}" wait "${child_pid}"
t POST "libpod/containers/${CTR}/wait?condition=running" 404
t POST "libpod/containers/${cid}/wait?condition=running" 404
# The container no longer exists but we want to ensure the remote client
# can still fetch the exit code correctly until the exit code is pruned
# (after 5 mins) but only by the container id and not the name.
t POST "libpod/containers/${CTR}/wait" 404
t POST "libpod/containers/${cid}/wait" 200 \
"3"