@@ -26,6 +26,7 @@ import (
2626 "github.com/cockroachdb/cockroach/pkg/keys"
2727 "github.com/cockroachdb/cockroach/pkg/kv"
2828 "github.com/cockroachdb/cockroach/pkg/kv/kvpb"
29+ "github.com/cockroachdb/cockroach/pkg/kv/kvserver"
2930 "github.com/cockroachdb/cockroach/pkg/roachpb"
3031 "github.com/cockroachdb/cockroach/pkg/rpc"
3132 "github.com/cockroachdb/cockroach/pkg/rpc/nodedialer"
@@ -175,6 +176,17 @@ func newTestCluster(
175176 NoLoopbackDialer : ! localRPCFastPath ,
176177 },
177178 },
179+ Store : & kvserver.StoreTestingKnobs {
180+ // Disable the lease queue to keep leases on s1 (otherwise, lease
181+ // count rebalancing might move one lease, and splits might copy
182+ // that lease to a number of additional ranges). Communication
183+ // between the gateway node (always n1) and the KV servers always
184+ // goes through TCP regardless of whether the gateway node equals
185+ // the KV node, but there are still subtle (and not well understood)
186+ // performance differences between then n1->n1 and n1->n[23] cases,
187+ // which add variance to the results.
188+ DisableLeaseQueue : true ,
189+ },
178190 }
179191 return serverutils .StartCluster (b , nodes , base.TestClusterArgs {
180192 ServerArgs : base.TestServerArgs {
0 commit comments