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

Merge pull request #104069 from pacoxu/fix-data-race-104057

Browse Source 
fix data race in kubelet volume test: add lock for ut
This commit is contained in:
Kubernetes Prow Robot 2021-09-09 21:09:59 -07:00 committed by GitHub
commit 5724484bda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/kubelet_volumes_test.go
View File

@ -315,8 +315,8 @@ func TestVolumeUnmountAndDetachControllerDisabled(t *testing.T) {
1 /* expectedSetUpCallCount */, testKubelet.volumePlugin)) 1 /* expectedSetUpCallCount */, testKubelet.volumePlugin))
// Remove pod // Remove pod
// TODO: this may not be threadsafe (technically waitForVolumeUnmount) // TODO: technically waitForVolumeUnmount
kubelet.podWorkers.(*fakePodWorkers).removeRuntime = map[types.UID]bool{pod.UID: true} kubelet.podWorkers.(*fakePodWorkers).setPodRuntimeBeRemoved(pod.UID)
kubelet.podManager.SetPods([]*v1.Pod{}) kubelet.podManager.SetPods([]*v1.Pod{})
assert.NoError(t, kubelet.volumeManager.WaitForUnmount(pod)) assert.NoError(t, kubelet.volumeManager.WaitForUnmount(pod))
@ -504,7 +504,7 @@ func TestVolumeUnmountAndDetachControllerEnabled(t *testing.T) {
1 /* expectedSetUpCallCount */, testKubelet.volumePlugin)) 1 /* expectedSetUpCallCount */, testKubelet.volumePlugin))
// Remove pod // Remove pod
kubelet.podWorkers.(*fakePodWorkers).removeRuntime = map[types.UID]bool{pod.UID: true} kubelet.podWorkers.(*fakePodWorkers).setPodRuntimeBeRemoved(pod.UID)
kubelet.podManager.SetPods([]*v1.Pod{}) kubelet.podManager.SetPods([]*v1.Pod{})
assert.NoError(t, waitForVolumeUnmount(kubelet.volumeManager, pod)) assert.NoError(t, waitForVolumeUnmount(kubelet.volumeManager, pod))

5
pkg/kubelet/pod_workers_test.go
View File

@ -111,6 +111,11 @@ func (f *fakePodWorkers) ShouldPodRuntimeBeRemoved(uid types.UID) bool {
defer f.statusLock.Unlock() defer f.statusLock.Unlock()
return f.removeRuntime[uid] return f.removeRuntime[uid]
} }
func (f *fakePodWorkers) setPodRuntimeBeRemoved(uid types.UID) {
f.statusLock.Lock()
defer f.statusLock.Unlock()
f.removeRuntime = map[types.UID]bool{uid: true}
}
func (f *fakePodWorkers) ShouldPodContentBeRemoved(uid types.UID) bool { func (f *fakePodWorkers) ShouldPodContentBeRemoved(uid types.UID) bool {
f.statusLock.Lock() f.statusLock.Lock()
defer f.statusLock.Unlock() defer f.statusLock.Unlock()