GitList

Browse code

Merge pull request #31070 from cpuguy83/31060_fix_log_read_spin

Fix cpu spin waiting for log write events
(cherry picked from commit 39851eac0c655d0c1911db58d4f630e2da233cac)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Brian Goff authored on 2017/02/17 10:15:38
Showing 1 changed files

daemon/logger/jsonfilelog/read.go index deff86d..30d533f 100644

daemon/logger/jsonfilelog/read.go

History View file @ 671a4aa

@@ -256,9 +256,12 @@ func followLogs(f *os.File, logWatcher *logger.LogWatcher, notifyRotate chan int
                      	handleDecodeErr := func(err error) error {
                      		if err == io.EOF {
                     -			for err := waitRead(); err != nil; {
                     +			for {
                     +				err := waitRead()
                     +				if err == nil {
                     +					break
                     +				}
                      				if err == errRetry {
                     -					// retry the waitRead
                      					continue
+                     				}
                      				return err