Merge pull request #947 from andyzhangx/fix-goroutine-leak

fix: goroutine leak when timeout

Author: andyzhangx

go.mod

@@ -18,6 +18,7 @@ require (
 	github.com/pborman/uuid v1.2.1
 	github.com/pelletier/go-toml v1.7.0
 	github.com/stretchr/testify v1.9.0
+	go.uber.org/goleak v1.3.0
 	golang.org/x/net v0.39.0
 	google.golang.org/grpc v1.65.0
 	k8s.io/api v0.29.14

pkg/util/util.go

@@ -39,7 +39,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 exec function
-	done := make(chan bool)
+	done := make(chan bool, 1)
 	var err error
 
 	// Start the exec function in a goroutine

pkg/util/util_test.go

@@ -21,9 +21,12 @@ import (
 	"reflect"
 	"testing"
 	"time"
+
+	"go.uber.org/goleak"
 )
 
 func TestWaitUntilTimeout(t *testing.T) {
+	defer goleak.VerifyNone(t)
 	tests := []struct {
 		desc        string
 		timeout     time.Duration
@@ -69,8 +72,11 @@ func TestWaitUntilTimeout(t *testing.T) {
 
 	for _, test := range tests {
 		err := WaitUntilTimeout(test.timeout, test.execFunc, test.timeoutFunc)
-		if err != nil && (err.Error() != test.expectedErr.Error()) {
-			t.Errorf("unexpected error: %v, expected error: %v", err, test.expectedErr)
+		if err != nil {
+			time.Sleep(2 * time.Second)
+			if err.Error() != test.expectedErr.Error() {
+				t.Errorf("unexpected error: %v, expected error: %v", err, test.expectedErr)
+			}
 		}
 	}
 }