Skip to content

Commit 4989713

Browse files
committed
kvnemesis: remove TestKVNemesisMultiNode_BufferedWritesNoPipelining
This configuration is no longer relevant since the TxnCoordSender disables pipelining when buffered writes is in use. Epic: none Release note: None
1 parent c4dbc61 commit 4989713

File tree

1 file changed

+7
-26
lines changed

1 file changed

+7
-26
lines changed

pkg/kv/kvnemesis/kvnemesis_test.go

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ func TestKVNemesisSingleNode_ReproposalChaos(t *testing.T) {
430430
}
431431

432432
// TestKVNemesisMultiNode_BufferedWritesNoLockDurabilityUpgrades runs KVNemesis
433-
// with write buffering enabled and no lock durability ugprades. We leave splits
433+
// with write buffering enabled and no lock durability upgrades. We leave splits
434434
// to be metamorphic since those are all handled in-memory.
435435
func TestKVNemesisMultiNode_BufferedWritesNoLockDurabilityUpgrades(t *testing.T) {
436436
defer leaktest.AfterTest(t)()
@@ -465,25 +465,6 @@ func TestKVNemesisMultiNode_BufferedWritesLockDurabilityUpgrades(t *testing.T) {
465465
testKVNemesisImpl(t, cfg)
466466
}
467467

468-
// TestKVNemesisMultiNode_BufferedWritesNoPipelining turns on buffered
469-
// writes and turns off write pipelining.
470-
func TestKVNemesisMultiNode_BufferedWritesNoPipelining(t *testing.T) {
471-
defer leaktest.AfterTest(t)()
472-
defer log.Scope(t).Close(t)
473-
474-
cfg := defaultTestConfiguration(3)
475-
cfg.seedOverride = 0
476-
cfg.bufferedWriteProb = 0.7
477-
cfg.testSettings = func(ctx context.Context, st *cluster.Settings) {
478-
kvcoord.BufferedWritesEnabled.Override(ctx, &st.SV, true)
479-
kvcoord.PipelinedWritesEnabled.Override(ctx, &st.SV, false)
480-
concurrency.UnreplicatedLockReliabilityLeaseTransfer.Override(ctx, &st.SV, true)
481-
concurrency.UnreplicatedLockReliabilityMerge.Override(ctx, &st.SV, true)
482-
concurrency.UnreplicatedLockReliabilitySplit.Override(ctx, &st.SV, true)
483-
}
484-
testKVNemesisImpl(t, cfg)
485-
}
486-
487468
func TestKVNemesisMultiNode_Partition_Safety(t *testing.T) {
488469
defer leaktest.AfterTest(t)()
489470
defer log.Scope(t).Close(t)
@@ -829,25 +810,25 @@ func setAndVerifyZoneConfigs(
829810
) {
830811
// Set constraints on the system database; GeneratorDataTableID inherits from it.
831812
sqlRunner.Exec(
832-
t, `ALTER DATABASE system CONFIGURE ZONE USING
833-
num_replicas = 3,
813+
t, `ALTER DATABASE system CONFIGURE ZONE USING
814+
num_replicas = 3,
834815
num_voters = 3,
835816
constraints = '{"+node=n1": 1, "+node=n2": 1}',
836817
voter_constraints = '{"+node=n1": 1, "+node=n2": 1}'`,
837818
)
838819

839820
// Ensure the liveness and meta ranges are also constrained appropriately.
840821
sqlRunner.Exec(
841-
t, `ALTER RANGE meta CONFIGURE ZONE USING
842-
num_replicas = 3,
822+
t, `ALTER RANGE meta CONFIGURE ZONE USING
823+
num_replicas = 3,
843824
num_voters = 3,
844825
constraints = '{"+node=n1": 1, "+node=n2": 1}',
845826
voter_constraints = '{"+node=n1": 1, "+node=n2": 1}'`,
846827
)
847828

848829
sqlRunner.Exec(
849-
t, `ALTER RANGE liveness CONFIGURE ZONE USING
850-
num_replicas = 3,
830+
t, `ALTER RANGE liveness CONFIGURE ZONE USING
831+
num_replicas = 3,
851832
num_voters = 3,
852833
constraints = '{"+node=n1": 1, "+node=n2": 1}',
853834
voter_constraints = '{"+node=n1": 1, "+node=n2": 1}'`,

0 commit comments

Comments
 (0)