github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

Added mutex locks when accessing file object

Browse Source
This commit is contained in:
Abhishek Kumar Srivastav 2023-10-27 15:39:33 +05:30
parent c8125c4029
commit 9ed4c58a1f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/kuberuntime/logs/logs_test.go
View File

@ -24,6 +24,7 @@ import (
"io" "io"
"os" "os"
"path/filepath" "path/filepath"
"sync"
"testing" "testing"
"time" "time"
@ -214,12 +215,12 @@ func TestReadLogs(t *testing.T) {
} }
func TestReadRotatedLog(t *testing.T) { func TestReadRotatedLog(t *testing.T) {
var mu sync.RWMutex
tmpDir := t.TempDir() tmpDir := t.TempDir()
file, err := os.CreateTemp(tmpDir, "logfile") file, err := os.CreateTemp(tmpDir, "logfile")
if err != nil { if err != nil {
assert.NoErrorf(t, err, "unable to create temp file") assert.NoErrorf(t, err, "unable to create temp file")
} }
stdoutBuf := &bytes.Buffer{} stdoutBuf := &bytes.Buffer{}
stderrBuf := &bytes.Buffer{} stderrBuf := &bytes.Buffer{}
containerID := "fake-container-id" containerID := "fake-container-id"
@ -240,7 +241,10 @@ func TestReadRotatedLog(t *testing.T) {
Follow: true, Follow: true,
} }
opts := NewLogOptions(&podLogOptions, time.Now()) opts := NewLogOptions(&podLogOptions, time.Now())
ReadLogs(ctx, file.Name(), containerID, opts, fakeRuntimeService, stdoutBuf, stderrBuf) mu.Lock()
path := file.Name()
mu.Unlock()
ReadLogs(ctx, path, containerID, opts, fakeRuntimeService, stdoutBuf, stderrBuf)
}(ctx) }(ctx)
// log in stdout // log in stdout
@ -254,6 +258,7 @@ func TestReadRotatedLog(t *testing.T) {
// Write 10 lines to log file. // Write 10 lines to log file.
// Let ReadLogs start. // Let ReadLogs start.
time.Sleep(50 * time.Millisecond) time.Sleep(50 * time.Millisecond)
for line := 0; line < 10; line++ { for line := 0; line < 10; line++ {
// Write the first three lines to log file // Write the first three lines to log file
now := time.Now().Format(types.RFC3339NanoLenient) now := time.Now().Format(types.RFC3339NanoLenient)
@ -277,10 +282,13 @@ func TestReadRotatedLog(t *testing.T) {
} }
newF := filepath.Join(dir, baseName) newF := filepath.Join(dir, baseName)
mu.Lock()
if file, err = os.Create(newF); err != nil { if file, err = os.Create(newF); err != nil {
mu.Unlock()
assert.NoError(t, err, "unable to create new log file") assert.NoError(t, err, "unable to create new log file")
return return
} }
mu.Unlock()
time.Sleep(20 * time.Millisecond) time.Sleep(20 * time.Millisecond)
} }
} }