Merge pull request #124081 from cockroachdb/blathers/backport-release…

…-24.1-124034 release-24.1: roachtest: fix maxWaitDuration in lease-preferences
cockroachdb · May 21, 2024 · df782c7 · df782c7
2 parents e761c57 + af4ebd9
commit df782c7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pkg/cmd/roachtest/tests/lease_preferences.go b/pkg/cmd/roachtest/tests/lease_preferences.go
@@ -366,11 +366,12 @@ func waitForLeasePreferences(
 	var ret leasePreferencesResult
 	ret.nodes = nodes
 	start := timeutil.Now()
+	maxWaitC := time.After(maxWaitDuration)
 	for {
 		select {
 		case <-ctx.Done():
 			return ret, ctx.Err()
-		case <-time.After(maxWaitDuration):
+		case <-maxWaitC:
 			return ret, errors.Errorf("timed out before lease preferences satisfied")
 		case <-checkTimer.C:
 			checkTimer.Read = true