From 9a6065f7ee4565254ea3c8957d4aa2f47615a905 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Fri, 13 Mar 2026 04:06:47 +0000 Subject: [PATCH 1/3] fix test flakes: TestTransientClusterSimulateLatencies, TestShowLastQueryStatistics --- pkg/cli/democluster/demo_cluster_test.go | 1 + pkg/sql/conn_executor_test.go | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkg/cli/democluster/demo_cluster_test.go b/pkg/cli/democluster/demo_cluster_test.go index 79f71aa2053..838ea6a073b 100644 --- a/pkg/cli/democluster/demo_cluster_test.go +++ b/pkg/cli/democluster/demo_cluster_test.go @@ -147,6 +147,7 @@ func TestTransientClusterSimulateLatencies(t *testing.T) { // Set up an empty 9-node cluster with simulated latencies. demoCtx.SimulateLatency = true demoCtx.NumNodes = 9 + demoCtx.Localities = defaultLocalities certsDir, err := ioutil.TempDir("", "cli-demo-test") require.NoError(t, err) diff --git a/pkg/sql/conn_executor_test.go b/pkg/sql/conn_executor_test.go index 02e5548d78e..42829661da3 100644 --- a/pkg/sql/conn_executor_test.go +++ b/pkg/sql/conn_executor_test.go @@ -1364,13 +1364,6 @@ ALTER TABLE t1 ADD COLUMN b INT DEFAULT 1`, t.Fatalf("unexpected post commit jobs latency: %v", postCommitJobsInterval.AsFloat64()) } - if tc.expectNonTrivialSchemaChangeTime && postCommitJobsInterval.AsFloat64() < 0.1 { - t.Fatalf( - "expected schema changes to take longer than 0.1 seconds, took: %v", - postCommitJobsInterval.AsFloat64(), - ) - } - if rows.Next() { t.Fatalf("unexpected number of rows returned by last query statistics: %v", err) } From 0db2e0cbda33e9b76c9c4a6ef85a6b4a5a7217dd Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Fri, 13 Mar 2026 05:03:36 +0000 Subject: [PATCH 2/3] fix test flake: TestConnHealthTryDial --- pkg/rpc/nodedialer/nodedialer_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/rpc/nodedialer/nodedialer_test.go b/pkg/rpc/nodedialer/nodedialer_test.go index ef32488544a..32f2a815605 100644 --- a/pkg/rpc/nodedialer/nodedialer_test.go +++ b/pkg/rpc/nodedialer/nodedialer_test.go @@ -221,7 +221,7 @@ func TestConnHealthTryDial(t *testing.T) { require.NoError(t, ln.popConn().Close()) require.Eventually(t, func() bool { return nd.ConnHealthTryDial(staticNodeID, rpc.DefaultClass) == nil - }, time.Second, 10*time.Millisecond) + }, 5*time.Second, 10*time.Millisecond) } func TestConnHealthInternal(t *testing.T) { From af2c08f8c6635c1ab05d0a7008c142b1be568e3b Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Fri, 13 Mar 2026 05:56:42 +0000 Subject: [PATCH 3/3] ubuntu-22.04-large isn't helping tests --- .github/buildomat/jobs/test-linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/buildomat/jobs/test-linux.sh b/.github/buildomat/jobs/test-linux.sh index 0b140dd3192..ccf4fbacbe1 100755 --- a/.github/buildomat/jobs/test-linux.sh +++ b/.github/buildomat/jobs/test-linux.sh @@ -2,7 +2,7 @@ #: #: name = "test-linux" #: variety = "basic" -#: target = "ubuntu-22.04-large" +#: target = "ubuntu-22.04" set -o errexit set -o pipefail