Skip to content

Commit 6d3b0f3

Browse files
committed
BACKPORT: Fix cpu spin waiting for log write events
Upstream reference: moby@7a17997 Fixes BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1655504 Signed-off-by: Sergio Lopez <slp@redhat.com>
1 parent 6522224 commit 6d3b0f3

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

daemon/logger/jsonfilelog/read.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,12 @@ func followLogs(f *os.File, logWatcher *logger.LogWatcher, notifyRotate chan int
271271

272272
handleDecodeErr := func(err error) error {
273273
if err == io.EOF {
274-
for err := waitRead(); err != nil; {
274+
for {
275+
err := waitRead()
276+
if err == nil {
277+
break
278+
}
275279
if err == errRetry {
276-
// retry the waitRead
277280
continue
278281
}
279282
return err

0 commit comments

Comments
 (0)