github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98938 from rphillips/fixes/race_TestSyncPodsDeletesWhenSourcesAreReadyPerQOS

Browse Source 
kubelet_test: fixes race in TestSyncPodsDeletesWhenSourcesAreReadyPerQOS
This commit is contained in:
Kubernetes Prow Robot 2021-02-10 09:10:59 -08:00 committed by GitHub
commit dcec526c80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/kubelet/kubelet_test.go
View File

@ -408,8 +408,6 @@ func TestSyncPodsStartPod(t *testing.T) {
} }
func TestSyncPodsDeletesWhenSourcesAreReadyPerQOS(t *testing.T) { func TestSyncPodsDeletesWhenSourcesAreReadyPerQOS(t *testing.T) {
ready := false // sources will not be ready initially, enabled later
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
go testKubelet.kubelet.podKiller.PerformPodKillingWork() go testKubelet.kubelet.podKiller.PerformPodKillingWork()
defer testKubelet.Cleanup() defer testKubelet.Cleanup()
@ -432,7 +430,7 @@ func TestSyncPodsDeletesWhenSourcesAreReadyPerQOS(t *testing.T) {
} }
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet
kubelet.cgroupsPerQOS = true // enable cgroupsPerQOS to turn on the cgroups cleanup kubelet.cgroupsPerQOS = true // enable cgroupsPerQOS to turn on the cgroups cleanup
kubelet.sourcesReady = config.NewSourcesReady(func(_ sets.String) bool { return ready }) kubelet.sourcesReady = config.NewSourcesReady(func(_ sets.String) bool { return true })
// HandlePodCleanups gets called every 2 seconds within the Kubelet's // HandlePodCleanups gets called every 2 seconds within the Kubelet's
// housekeeping routine. This test registers the pod, removes the unwanted pod, then calls into // housekeeping routine. This test registers the pod, removes the unwanted pod, then calls into
@ -440,11 +438,6 @@ func TestSyncPodsDeletesWhenSourcesAreReadyPerQOS(t *testing.T) {
// within a goroutine so a two second delay should be enough time to // within a goroutine so a two second delay should be enough time to
// mark the pod as killed (within this test case). // mark the pod as killed (within this test case).
kubelet.HandlePodCleanups()
time.Sleep(2 * time.Second)
fakeRuntime.AssertKilledPods([]string{}) // Sources are not ready yet. Don't remove any pods.
ready = true // mark sources as ready
kubelet.HandlePodCleanups() kubelet.HandlePodCleanups()
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
@ -456,18 +449,25 @@ func TestSyncPodsDeletesWhenSourcesAreReadyPerQOS(t *testing.T) {
kubelet.HandlePodCleanups() kubelet.HandlePodCleanups()
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
fakeContainerManager.PodContainerManager.Lock()
defer fakeContainerManager.PodContainerManager.Unlock()
calledFunctionCount := len(fakeContainerManager.PodContainerManager.CalledFunctions)
destroyCount := 0 destroyCount := 0
for _, functionName := range fakeContainerManager.PodContainerManager.CalledFunctions { err := wait.Poll(100*time.Millisecond, 10*time.Second, func() (bool, error) {
if functionName == "Destroy" { fakeContainerManager.PodContainerManager.Lock()
destroyCount = destroyCount + 1 defer fakeContainerManager.PodContainerManager.Unlock()
destroyCount = 0
for _, functionName := range fakeContainerManager.PodContainerManager.CalledFunctions {
if functionName == "Destroy" {
destroyCount = destroyCount + 1
}
} }
} return destroyCount >= 1, nil
})
assert.Equal(t, 1, destroyCount, "Expect only 1 destroy") assert.NoError(t, err, "wait should not return error")
assert.True(t, calledFunctionCount > 2, "expect more than two PodContainerManager calls") // housekeeping can get called multiple times. The cgroup Destroy() is
// done within a goroutine and can get called multiple times, so the
// Destroy() count in not deterministic on the actual number.
// https://github.com/kubernetes/kubernetes/blob/29fdbb065b5e0d195299eb2d260b975cbc554673/pkg/kubelet/kubelet_pods.go#L2006
assert.True(t, destroyCount >= 1, "Expect 1 or more destroys")
} }
func TestSyncPodsDeletesWhenSourcesAreReady(t *testing.T) { func TestSyncPodsDeletesWhenSourcesAreReady(t *testing.T) {