fix: stop and drain timer before Reset in WaitFor

johnstcn · johnstcn · commit ede4348e1402 · 2026-02-12T13:07:31.000Z
diff --git a/lib/util/util.go b/lib/util/util.go
@@ -76,6 +76,12 @@ func WaitFor(ctx context.Context, timeout WaitTimeout, condition func() (bool, e
 		}
 
 		interval = min(interval*2, maxInterval)
+		if !sleepTimer.Stop() {
+			select {
+			case <-sleepTimer.C:
+			default:
+			}
+		}
 		sleepTimer.Reset(interval)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,12 @@ func WaitFor(ctx context.Context, timeout WaitTimeout, condition func() (bool, e`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`interval = min(interval*2, maxInterval)`
	`79`	`+ if !sleepTimer.Stop() {`
	`80`	`+ select {`
	`81`	`+ case <-sleepTimer.C:`
	`82`	`+ default:`
	`83`	`+ }`
	`84`	`+ }`
`79`	`85`	`sleepTimer.Reset(interval)`
`80`	`86`	`}`
`81`	`87`	`}`