Skip to content

Commit f538b25

Browse files
authored
Merge pull request #146243 from cockroachdb/blathers/backport-release-25.2-146219
release-25.2: roachtest: deflake declarative_schema_changer/job-compatibility-mixed-version
2 parents 5392d6d + 2062a6c commit f538b25

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

pkg/cmd/roachtest/tests/mixed_version_job_compatibility_in_declarative_schema_changer.go

+5
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ func setShortJobIntervalsStep(
5555
func setShortGCTTLInSystemZoneConfig(
5656
ctx context.Context, l *logger.Logger, r *rand.Rand, h *mixedversion.Helper,
5757
) error {
58+
// Ensure the system database has a longer TTL interval, which is needed to avoid
59+
// flakes on system database queries for upgrades.
60+
if err := h.Exec(r, "ALTER DATABASE system CONFIGURE ZONE USING gc.ttlseconds=60;"); err != nil {
61+
return err
62+
}
5863
return h.Exec(r, "ALTER RANGE default CONFIGURE ZONE USING gc.ttlseconds = 1;")
5964
}
6065

0 commit comments

Comments
 (0)