Merge pull request #22969 from AkihiroSuda/fix22963LogRace

Fix a race in daemon/logger.TestCopier
Upstream-commit: a41e823c1bcbaafca1081dd23a7af3fa25ac946f
Component: engine

components/engine/daemon/logger/copier_test.go

@@ -4,12 +4,14 @@ import (
 	"bytes"
 	"encoding/json"
 	"io"
+	"sync"
 	"testing"
 	"time"
 )
 
 type TestLoggerJSON struct {
 	*json.Encoder
+	mu    sync.Mutex
 	delay time.Duration
 }
 
@@ -17,6 +19,8 @@ func (l *TestLoggerJSON) Log(m *Message) error {
 	if l.delay > 0 {
 		time.Sleep(l.delay)
 	}
+	l.mu.Lock()
+	defer l.mu.Unlock()
 	return l.Encode(m)
 }