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

Merge pull request #127736 from carlory/fix-127520

Browse Source 
Fix close of closed channel in Test_Run_Positive_VolumeMountControllerAttachEnabledRace
This commit is contained in:
Kubernetes Prow Robot 2024-09-30 10:36:02 +01:00 committed by GitHub
commit 4aeaf1e99e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/volumemanager/reconciler/reconciler_test.go
View File

@ -20,6 +20,7 @@ import (
"crypto/md5"
"fmt"
"path/filepath"
"sync"
"testing"
"time"
@ -2183,6 +2184,8 @@ func Test_Run_Positive_VolumeMountControllerAttachEnabledRace(t *testing.T) {
<-stoppedChan
finished := make(chan interface{})
finishedOnce := &sync.Once{}
fakePlugin.Lock()
fakePlugin.UnmountDeviceHook = func(mountPath string) error {
// Act:
@ -2196,14 +2199,15 @@ func Test_Run_Positive_VolumeMountControllerAttachEnabledRace(t *testing.T) {
}
fakePlugin.WaitForAttachHook = func(spec *volume.Spec, devicePath string, pod *v1.Pod, spectimeout time.Duration) (string, error) {
defer finishedOnce.Do(func() {
close(finished)
})
// Assert
// 4. When the volume is mounted again, expect that UnmountDevice operation did not clear devicePath
if devicePath == "" {
klog.ErrorS(nil, "Expected WaitForAttach called with devicePath from Node.Status")
close(finished)
return "", fmt.Errorf("Expected devicePath from Node.Status")
}
close(finished)
return devicePath, nil
}
fakePlugin.Unlock()