container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-19 16:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10742 from vrothberg/fix-10675

Browse source 
logs: k8s-file: restore poll sleep
This commit is contained in:
OpenShift Merge Robot 2021-06-21 13:06:04 -04:00 committed by GitHub
parent 18bf92f7ea ee4cab0e09
commit be15e69a61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libpod/container_log.go
View file

@ -4,10 +4,12 @@ import (
"context" "context"
"fmt" "fmt"
"os" "os"
"time"
"github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/libpod/define"
"github.com/containers/podman/v3/libpod/events" "github.com/containers/podman/v3/libpod/events"
"github.com/containers/podman/v3/libpod/logs" "github.com/containers/podman/v3/libpod/logs"
"github.com/hpcloud/tail/watch"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -74,7 +76,7 @@ func (c *Container) readFromLogFile(ctx context.Context, options *logs.LogOption
} }
nll, err := logs.NewLogLine(line.Text) nll, err := logs.NewLogLine(line.Text)
if err != nil { if err != nil {
logrus.Error(err) logrus.Errorf("Error getting new log line: %v", err)
continue continue
} }
if nll.Partial() { if nll.Partial() {
@ -93,17 +95,20 @@ func (c *Container) readFromLogFile(ctx context.Context, options *logs.LogOption
}() }()
// Check if container is still running or paused // Check if container is still running or paused
if options.Follow { if options.Follow {
// If the container isn't running or if we encountered an error
// getting its state, instruct the logger to read the file
// until EOF.
state, err := c.State() state, err := c.State()
if err != nil || state != define.ContainerStateRunning { if err != nil || state != define.ContainerStateRunning {
// If the container isn't running or if we encountered // Make sure to wait at least for the poll duration
// an error getting its state, instruct the logger to // before stopping the file logger (see #10675).
// read the file until EOF. time.Sleep(watch.POLL_DURATION)
tailError := t.StopAtEOF() tailError := t.StopAtEOF()
if tailError != nil && fmt.Sprintf("%v", tailError) != "tail: stop at eof" { if tailError != nil && fmt.Sprintf("%v", tailError) != "tail: stop at eof" {
logrus.Error(tailError) logrus.Errorf("Error stopping logger: %v", tailError)
} }
if errors.Cause(err) != define.ErrNoSuchCtr { if err != nil && errors.Cause(err) != define.ErrNoSuchCtr {
logrus.Error(err) logrus.Errorf("Error getting container state: %v", err)
} }
return nil return nil
} }
@ -124,9 +129,12 @@ func (c *Container) readFromLogFile(ctx context.Context, options *logs.LogOption
// Now wait for the died event and signal to finish // Now wait for the died event and signal to finish
// reading the log until EOF. // reading the log until EOF.
<-eventChannel <-eventChannel
// 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() tailError := t.StopAtEOF()
if tailError != nil && fmt.Sprintf("%v", tailError) != "tail: stop at eof" { if tailError != nil && fmt.Sprintf("%v", tailError) != "tail: stop at eof" {
logrus.Error(tailError) logrus.Errorf("Error stopping logger: %v", tailError)
} }
}() }()
} }