Merge pull request #1948 from andyzhangx/fix-goroutine-leak-1.26

[release-1.26] fix: goroutine leak when timeout

Author: andyzhangx

go.mod

@@ -25,6 +25,7 @@ require (
 	github.com/pborman/uuid v1.2.1
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.10.0
+	go.uber.org/goleak v1.3.0
 	go.uber.org/mock v0.5.0
 	golang.org/x/net v0.37.0
 	golang.org/x/sync v0.12.0

pkg/util/util.go

@@ -404,7 +404,7 @@ type TimeoutFunc func() (err error)
 // WaitUntilTimeout waits for the exec function to complete or return timeout error
 func WaitUntilTimeout(timeout time.Duration, execFunc ExecFunc, timeoutFunc TimeoutFunc) error {
 	// Create a channel to receive the result of the azcopy exec function
-	done := make(chan bool)
+	done := make(chan bool, 1)
 	var err error
 
 	// Start the azcopy exec function in a goroutine

pkg/util/util_test.go

@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"go.uber.org/goleak"
 	"go.uber.org/mock/gomock"
 	"k8s.io/kubernetes/pkg/volume"
 )
@@ -821,6 +822,7 @@ func TestSetVolumeOwnership(t *testing.T) {
 }
 
 func TestWaitUntilTimeout(t *testing.T) {
+	defer goleak.VerifyNone(t)
 	tests := []struct {
 		desc        string
 		timeout     time.Duration
@@ -847,6 +849,7 @@ func TestWaitUntilTimeout(t *testing.T) {
 				return nil
 			},
 			timeoutFunc: func() error {
+				time.Sleep(2 * time.Second)
 				return fmt.Errorf("timeout error")
 			},
 			expectedErr: fmt.Errorf("timeout error"),