Merge #131305

131305: testutils: data race when TestCluster fails to start r=tbg a=vidit-bhat Previously, we were running into a race condition due to the access of the `stores` map in the error reporting inside the timeout logic. This patch fixes this by reporting the error after grabbing a lock on `stores`. Epic: none Fixes: #87592 Release note: None Co-authored-by: Vidit Bhat <[email protected]>
cockroachdb · Sep 25, 2024 · cbc681e · cbc681e
2 parents e1b5321 + 6d11799
commit cbc681e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/testutils/testcluster/testcluster.go b/pkg/testutils/testcluster/testcluster.go
@@ -685,7 +685,11 @@ func (tc *TestCluster) WaitForNStores(t serverutils.TestFataler, n int, g *gossi
 			}
 			t.Fatal(err)
 		case <-time.After(testutils.DefaultSucceedsSoonDuration):
-			t.Fatalf("timed out waiting for %d store descriptors: %v", n-seen, stores)
+			func() {
+				storesMu.Lock()
+				defer storesMu.Unlock()
+				t.Fatalf("timed out waiting for %d store descriptors: %v", n-seen, stores)
+			}()
 		}
 	}
 }