Merge #155806

155806:  roachtest: run bidirectional kv ldr tests with uniform distribution r=jeffswenson a=msbutler

LDR tests have been struggling to keep up with the high conflict rate that the
zipfian distribution creates, which the kv workload for streaming tests
recently began using. This patch ensures bidi roachtests use a uniform dist
instead.

Informs: #155649
Informs: #155227

Release note: none

Co-authored-by: Michael Butler <butler@cockroachlabs.com>

Author: craig[bot]

pkg/cmd/roachtest/tests/cluster_to_cluster.go

@@ -319,6 +319,11 @@ type replicateKV struct {
 	// preparing writing statements. This is necessary to get the workload running
 	// properly on a read only standby tenant.
 	readOnly bool
+
+	// uniform makes the kv workload use a uniform key instead of zipfian.
+	// Bidirectional LDR tests should probably use uniform to reduce conflict
+	// rate.
+	uniform bool
 }
 
 func (kv replicateKV) sourceInitCmd(tenantName string, nodes option.NodeListOption) string {
@@ -342,7 +347,7 @@ func (kv replicateKV) sourceRunCmd(tenantName string, nodes option.NodeListOptio
 		MaybeFlag(kv.debugRunDuration > 0, "duration", kv.debugRunDuration).
 		MaybeFlag(kv.maxQPS > 0, "max-rate", kv.maxQPS).
 		MaybeFlag(kv.readOnly, "prepare-read-only", true).
-		Option("zipfian").
+		MaybeOption(!kv.uniform, "zipfian").
 		Arg("{pgurl%s:%s}", nodes, tenantName).
 		WithEqualsSyntax()
 	return cmd.String()

pkg/cmd/roachtest/tests/logical_data_replication.go

@@ -90,7 +90,7 @@ func registerLogicalDataReplicationTests(r registry.Registry) {
 					spec.VolumeSize(100),
 				},
 			},
-			ldrConfig: ldrConfig{mode: ModeValidated},
+			ldrConfig: ldrConfig{},
 			run:       TestLDRBasic,
 		},
 		{
@@ -281,7 +281,9 @@ func TestLDRBasic(
 			maxBlockBytes:           maxBlockBytes,
 			initRows:                initRows,
 			tolerateErrors:          true,
-			initWithSplitAndScatter: !c.IsLocal()},
+			initWithSplitAndScatter: !c.IsLocal(),
+			uniform:                 true,
+		},
 		dbName:     "kv",
 		tableNames: []string{"kv"},
 	}
@@ -317,6 +319,7 @@ func TestLDRSchemaChange(
 			initRows:                1000,
 			initWithSplitAndScatter: true,
 			tolerateErrors:          true,
+			uniform:                 true,
 		},
 		dbName:     "kv",
 		tableNames: []string{"kv"},
@@ -589,7 +592,9 @@ func TestLDROnNodeShutdown(
 			maxBlockBytes:           1024,
 			initRows:                1000,
 			tolerateErrors:          true,
-			initWithSplitAndScatter: true},
+			initWithSplitAndScatter: true,
+			uniform:                 true,
+		},
 		dbName:     "kv",
 		tableNames: []string{"kv"},
 	}
@@ -707,7 +712,9 @@ func TestLDROnNetworkPartition(
 			maxBlockBytes:           1024,
 			initRows:                1000,
 			tolerateErrors:          true,
-			initWithSplitAndScatter: true},
+			initWithSplitAndScatter: true,
+			uniform:                 true,
+		},
 		dbName:     "kv",
 		tableNames: []string{"kv"},
 	}