Skip to content

Commit 7983b7e

Browse files
craig[bot]miraradeva
andcommitted
Merge #143788
143788: roachtest: tune leader lease kv/splits tests r=miraradeva a=miraradeva Since all recent leader-lease PRs have merged, this commit adjusts the target number of ranges expected to reach with leader leases. It also fixed an bug that resulted in all leader-lease tests running with quiescence enabled (even the ones with `quiesce=false`). Fixes: #141820 Fixes: #141828 Release note: None Co-authored-by: Mira Radeva <[email protected]>
2 parents 8853e26 + 2f9cc18 commit 7983b7e

File tree

1 file changed

+5
-2
lines changed
  • pkg/cmd/roachtest/tests

1 file changed

+5
-2
lines changed

pkg/cmd/roachtest/tests/kv.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -760,12 +760,12 @@ func registerKVSplits(r registry.Registry) {
760760
{false, 60_000, registry.LeaderLeases, 2 * time.Hour, nil},
761761
// Leader leases with quiescence don't quite match epoch leases with
762762
// quiescence because in leader leases only the followers ever quiesce.
763-
{true, 90_000, registry.LeaderLeases, 2 * time.Hour, nil},
763+
{true, 80_000, registry.LeaderLeases, 2 * time.Hour, nil},
764764
// With some additional tuning, leader leases can do even better. The extended interval allow
765765
// for more flexibility in extending store liveness support, and prevent support withdrawals at
766766
// higher CPU utilization when goroutine scheduling latency is high.
767767
{
768-
true, 120_000, registry.LeaderLeases, 2 * time.Hour,
768+
true, 100_000, registry.LeaderLeases, 2 * time.Hour,
769769
[]string{
770770
"COCKROACH_STORE_LIVENESS_SUPPORT_EXPIRY_INTERVAL=1s",
771771
"COCKROACH_STORE_LIVENESS_HEARTBEAT_INTERVAL=3s",
@@ -794,6 +794,9 @@ func registerKVSplits(r registry.Registry) {
794794
settings := install.MakeClusterSettings()
795795
settings.Env = append(settings.Env, "COCKROACH_MEMPROF_INTERVAL=1m", "COCKROACH_DISABLE_QUIESCENCE="+strconv.FormatBool(!item.quiesce))
796796
settings.Env = append(settings.Env, item.envVars...)
797+
if !item.quiesce {
798+
settings.ClusterSettings["kv.raft.store_liveness.quiescence.enabled"] = "false"
799+
}
797800
startOpts := option.NewStartOpts(option.NoBackupSchedule)
798801
startOpts.RoachprodOpts.ExtraArgs = append(startOpts.RoachprodOpts.ExtraArgs, "--cache=256MiB")
799802
c.Start(ctx, t.L(), startOpts, settings, c.CRDBNodes())

0 commit comments

Comments
 (0)