apimachinery/pkg/util/wait: Fix potential goroutine leak in pollInternal().

Without the change, the wait function wouldn't exit until the timeout happens, so if the timeout is set to a big value and the Poll() is run inside a loop, then the total goroutines will increase indefinitely. This PR fix the issue by closing the stop channel to tell the wait function to exit immediately if condition is true or any error happens.

apimachinery/pkg/util/wait: Fix potential goroutine leak in pollInternal().
3d039186 · Yifan Gu · 708d30a8 · 3d039186
Commit 3d039186 authored Apr 25, 2017 by Yifan Gu
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

wait.go staging/src/k8s.io/apimachinery/pkg/util/wait/wait.go +3 -1

No files found.
--- a/staging/src/k8s.io/apimachinery/pkg/util/wait/wait.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/wait/wait.go
@@ -186,7 +186,9 @@ func Poll(interval, timeout time.Duration, condition ConditionFunc) error {
 }

 func pollInternal(wait WaitFunc, condition ConditionFunc) error {
-	return WaitFor(wait, condition, NeverStop)
+	done := make(chan struct{})
+	defer close(done)
+	return WaitFor(wait, condition, done)
 }

 // PollImmediate tries a condition func until it returns true, an error, or the timeout