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

Merge pull request #123469 from harshanarayana/hfx/fix/kubelet-log-rotate-race

Browse Source 
kubelet: fix flaky unit test with TestRotateLogs due to improper handling of goroutine in the tests
This commit is contained in:
Kubernetes Prow Robot 2024-02-23 04:04:26 -08:00 committed by GitHub
commit fc7325fbec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/kubelet/logs/container_log_manager_test.go
View File

@ -157,15 +157,23 @@ func TestRotateLogs(t *testing.T) {
}, },
} }
f.SetFakeContainers(testContainers) f.SetFakeContainers(testContainers)
go c.processQueueItems(ctx, 1)
// Push the items into the queue for before starting the worker to avoid issue with the queue being empty.
require.NoError(t, c.rotateLogs(ctx)) require.NoError(t, c.rotateLogs(ctx))
pollTimeoutCtx, cancel := context.WithTimeout(ctx, 10*time.Second) // Start a routine that can monitor the queue and shutdown the queue to trigger the retrun from the processQueueItems
defer cancel() // Keeping the monitor duration smaller in order to keep the unwanted delay in the test to a minimal.
err = wait.PollUntilContextCancel(pollTimeoutCtx, 20*time.Millisecond, false, func(ctx context.Context) (done bool, err error) { go func() {
return c.queue.Len() == 0, nil pollTimeoutCtx, cancel := context.WithTimeout(ctx, 10*time.Second)
}) defer cancel()
require.NoError(t, err) err = wait.PollUntilContextCancel(pollTimeoutCtx, 5*time.Millisecond, false, func(ctx context.Context) (done bool, err error) {
return c.queue.Len() == 0, nil
})
require.NoError(t, err)
c.queue.ShutDown()
}()
// This is a blocking call. But the above routine takes care of ensuring that this is terminated once the queue is shutdown
c.processQueueItems(ctx, 1)
timestamp := now.Format(timestampFormat) timestamp := now.Format(timestampFormat)
logs, err := os.ReadDir(dir) logs, err := os.ReadDir(dir)
@ -176,7 +184,6 @@ func TestRotateLogs(t *testing.T) {
assert.Equal(t, testLogs[4]+compressSuffix, logs[2].Name()) assert.Equal(t, testLogs[4]+compressSuffix, logs[2].Name())
assert.Equal(t, testLogs[2]+"."+timestamp, logs[3].Name()) assert.Equal(t, testLogs[2]+"."+timestamp, logs[3].Name())
assert.Equal(t, testLogs[3], logs[4].Name()) assert.Equal(t, testLogs[3], logs[4].Name())
c.queue.ShutDown()
} }
func TestClean(t *testing.T) { func TestClean(t *testing.T) {