Skip to content

Commit cc0eb4f

Browse files
authored
Merge pull request #151129 from cockroachdb/blathers/backport-release-25.3-151036
release-25.3: roachtest: restrict rebalance/by-load/*/mixed-version to v25.1+
2 parents 2cf9e9c + 242658f commit cc0eb4f

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

pkg/cmd/roachtest/tests/rebalance_load.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,12 @@ func registerRebalanceLoad(r registry.Registry) {
110110
),
111111
// Only use the latest version of each release to work around #127029.
112112
mixedversion.AlwaysUseLatestPredecessors,
113-
mixedversion.MinimumSupportedVersion("v23.2.0"),
113+
// There have been many performance improvements in versions 25.1.0+.
114+
// In particular, the CPU utilization attributed to SQL can vary
115+
// significantly between versions, which can lead to flakiness in these
116+
// tests since the StoreRebalancer, which operates at the store level,
117+
// is unaware of such CPU use (e.g. #150603).
118+
mixedversion.MinimumSupportedVersion("v25.1.0"),
114119
)
115120
mvt.OnStartup("maybe enable split/scatter on tenant",
116121
func(ctx context.Context, l *logger.Logger, r *rand.Rand, h *mixedversion.Helper) error {

0 commit comments

Comments
 (0)