container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-22 02:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11464 from vrothberg/fix-11461

Browse source 
logs -f: file: fix dead lock
This commit is contained in:
OpenShift Merge Robot 2021-09-07 14:18:41 +02:00 committed by GitHub
parent 6e3a2d3eca 1eaa449590
commit c20227bd16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libpod/container_log.go
View file

@ -107,16 +107,18 @@ func (c *Container) readFromLogFile(ctx context.Context, options *logs.LogOption
// until EOF.
state, err := c.State()
if err != nil || state != define.ContainerStateRunning {
if err != nil && errors.Cause(err) != define.ErrNoSuchCtr {
logrus.Errorf("Error getting container state: %v", err)
}
go func() {
// Make sure to wait at least for the poll duration
// before stopping the file logger (see #10675).
time.Sleep(watch.POLL_DURATION)
tailError := t.StopAtEOF()
if tailError != nil && fmt.Sprintf("%v", tailError) != "tail: stop at eof" {
if tailError != nil && tailError.Error() != "tail: stop at eof" {
logrus.Errorf("Error stopping logger: %v", tailError)
}
if err != nil && errors.Cause(err) != define.ErrNoSuchCtr {
logrus.Errorf("Error getting container state: %v", err)
}
}()
return nil
}

27
test/system/035-logs.bats
View file

@ -174,4 +174,31 @@ $s_after"
_log_test_until journald
}
function _log_test_follow() {
local driver=$1
cname=$(random_string)
contentA=$(random_string)
contentB=$(random_string)
contentC=$(random_string)
# Note: it seems we need at least three log lines to hit #11461.
run_podman run --log-driver=$driver --name $cname $IMAGE sh -c "echo $contentA; echo $contentB; echo $contentC"
run_podman logs -f $cname
is "$output" "$contentA
$contentB
$contentC" "logs -f on exitted container works"
run_podman rm -f $cname
}
@test "podman logs - --follow k8s-file" {
_log_test_follow k8s-file
}
@test "podman logs - --follow journald" {
# We can't use journald on RHEL as rootless: rhbz#1895105
skip_if_journald_unavailable
_log_test_follow journald
}
# vim: filetype=sh