Skip to content

Commit cb692bc

Browse files
committed
roachtest: remove redundant cluster settings in lease-preferences
`server.span_stats.span_batch_limit` no longer needs to be set after `kv.enqueue_in_replicate_queue_on_span_config_update.enabled` defaults to true in versions on or after `v24.1`. Informs: #141359 Informs: #145055 Release note: None
1 parent 631e617 commit cb692bc

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

pkg/cmd/roachtest/tests/lease_preferences.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@ func runLeasePreferences(
179179
allNodes = append(allNodes, i)
180180
}
181181

182-
// TODO(kvoli): temporary workaround for
183-
// https://github.com/cockroachdb/cockroach/issues/105274
184-
settings := install.MakeClusterSettings()
185-
settings.ClusterSettings["server.span_stats.span_batch_limit"] = "4096"
186-
settings.ClusterSettings["kv.enqueue_in_replicate_queue_on_span_config_update.enabled"] = "true"
187-
188182
startNodes := func(nodes ...int) {
189183
for _, node := range nodes {
190184
// Don't start a backup schedule because this test is timing sensitive.
@@ -198,7 +192,7 @@ func runLeasePreferences(
198192
// dc=N: n2N-1 n2N
199193
fmt.Sprintf("--locality=region=fake-region,zone=fake-zone,dc=%d", (node-1)/2+1),
200194
"--vmodule=replica_proposal=2,lease_queue=3,lease=3")
201-
c.Start(ctx, t.L(), opts, settings, c.Node(node))
195+
c.Start(ctx, t.L(), opts, install.MakeClusterSettings(), c.Node(node))
202196

203197
}
204198
}

0 commit comments

Comments
 (0)