Merge #106736

106736: sql: stablize TestValidateMixedVersionElements test r=chengxiong-ruan a=chengxiong-ruan Informs: #106612, #106689 Use shorter liveness heart beat interval and longer liveness ttl and hope that would help easing the flakiness. Release note: None Co-authored-by: Chengxiong Ruan <[email protected]>
cockroachdb · Jul 13, 2023 · 78f390d · 78f390d
2 parents 20fdc91 + 032c6e1
commit 78f390d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/sql/schemachanger/sctest/cumulative.go b/pkg/sql/schemachanger/sctest/cumulative.go
@@ -1706,6 +1706,10 @@ func ValidateMixedVersionElements(t *testing.T, path string, newCluster NewMixed
 						},
 					}, true /*down level*/)
 					tdb := sqlutils.MakeSQLRunner(db)
+					// Use shorter liveness heartbeat interval and longer liveness ttl to
+					// avoid errors caused by refused connections.
+					tdb.Exec(t, `SET CLUSTER SETTING server.sqlliveness.heartbeat = '1s'`)
+					tdb.Exec(t, `SET CLUSTER SETTING server.sqlliveness.ttl = '120s'`)
 
 					// Wait for the schema changer job to hit desired stage, pause the job,
 					// perform a cluster upgrade, and resume the job.