From 37510f25583b4954e5ef777654dadffec2ff1781 Mon Sep 17 00:00:00 2001 From: Nathan VanBenschoten Date: Mon, 13 May 2024 08:59:42 -0400 Subject: [PATCH] roachtest: fix maxWaitDuration in lease-preferences Informs #123998. The attempt to limit how long waitForLeasePreferences was broken. Release note: None --- pkg/cmd/roachtest/tests/lease_preferences.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/cmd/roachtest/tests/lease_preferences.go b/pkg/cmd/roachtest/tests/lease_preferences.go index af9c70e1c97f..c278dcf9faa3 100644 --- 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