Merge #153185

153185: roachtest: remove tpccbench variant with pipelining and buffering r=miraradeva a=miraradeva

Buffered writes and write pipelining are mutially exclusive as of recently, so remove the tpccbench variant that tries to enable both.

While here, also bump up the max warehouses for some tests that have failed recently.

Fixes: #152809
Fixes: #152810
Fixes: #152811
Fixes: #153022

Release note: None

Co-authored-by: Mira Radeva <[email protected]>

Author: craig[bot]

pkg/cmd/roachtest/registry/test_spec.go

@@ -309,8 +309,6 @@ func (w WriteOptimizationType) String() string {
 		return "pipelining"
 	case Buffering:
 		return "buffering"
-	case PipeliningBuffering:
-		return "pipelining-buffering"
 	default:
 		return fmt.Sprintf("writeoptimization-%d", w)
 	}
@@ -319,12 +317,10 @@ func (w WriteOptimizationType) String() string {
 const (
 	// DefaultWriteOptimization uses the default cluster settings.
 	DefaultWriteOptimization = WriteOptimizationType(iota)
-	// Pipelining uses write pipelining.
+	// Pipelining uses write pipelining, and disables buffering.
 	Pipelining
-	// Buffering uses client-side write buffering.
+	// Buffering uses client-side write buffering, and disabled pipelining.
 	Buffering
-	// PipeliningBuffering uses both buffering and pipelining.
-	PipeliningBuffering
 )
 
 // CloudSet represents a set of clouds.

pkg/cmd/roachtest/test_runner.go

@@ -972,9 +972,6 @@ func (r *testRunner) runWorker(
 				case registry.Buffering:
 					c.clusterSettings["kv.transaction.write_buffering.enabled"] = "true"
 					c.clusterSettings["kv.transaction.write_pipelining.enabled"] = "false"
-				case registry.PipeliningBuffering:
-					c.clusterSettings["kv.transaction.write_pipelining.enabled"] = "true"
-					c.clusterSettings["kv.transaction.write_buffering.enabled"] = "true"
 				}
 
 				// Apply metamorphic settings not explicitly defined by the test.

pkg/cmd/roachtest/tests/tpcc.go

@@ -1499,29 +1499,29 @@ func registerTPCC(r registry.Registry) {
 		Nodes: 3,
 		CPUs:  16,
 
-		LoadWarehousesGCE:   5500,
-		LoadWarehousesAWS:   5500,
-		LoadWarehousesAzure: 5500,
-		LoadWarehousesIBM:   5500,
-		EstimatedMaxGCE:     4500,
-		EstimatedMaxAWS:     4500,
-		EstimatedMaxAzure:   4500,
-		EstimatedMaxIBM:     4500,
+		LoadWarehousesGCE:   6000,
+		LoadWarehousesAWS:   6000,
+		LoadWarehousesAzure: 6000,
+		LoadWarehousesIBM:   6000,
+		EstimatedMaxGCE:     5000,
+		EstimatedMaxAWS:     5000,
+		EstimatedMaxAzure:   5000,
+		EstimatedMaxIBM:     5000,
 		Clouds:              registry.AllClouds,
 		Suites:              registry.Suites(registry.Nightly),
 	})
 	registerTPCCBenchSpec(r, tpccBenchSpec{
 		Nodes: 3,
 		CPUs:  16,
 
-		LoadWarehousesGCE:   5500,
-		LoadWarehousesAWS:   5500,
-		LoadWarehousesAzure: 5500,
-		LoadWarehousesIBM:   5500,
-		EstimatedMaxGCE:     4500,
-		EstimatedMaxAWS:     4500,
-		EstimatedMaxAzure:   4500,
-		EstimatedMaxIBM:     4500,
+		LoadWarehousesGCE:   6000,
+		LoadWarehousesAWS:   6000,
+		LoadWarehousesAzure: 6000,
+		LoadWarehousesIBM:   6000,
+		EstimatedMaxGCE:     5000,
+		EstimatedMaxAWS:     5000,
+		EstimatedMaxAzure:   5000,
+		EstimatedMaxIBM:     5000,
 		Clouds:              registry.AllClouds,
 		Suites:              registry.Suites(registry.Nightly),
 		SharedProcessMT:     true,
@@ -1672,10 +1672,10 @@ func registerTPCC(r registry.Registry) {
 		Nodes: 3,
 		CPUs:  16,
 
-		LoadWarehousesGCE:   5000,
-		LoadWarehousesAWS:   5000,
-		LoadWarehousesAzure: 5000,
-		LoadWarehousesIBM:   5000,
+		LoadWarehousesGCE:   5500,
+		LoadWarehousesAWS:   5500,
+		LoadWarehousesAzure: 5500,
+		LoadWarehousesIBM:   5500,
 		EstimatedMaxGCE:     4500,
 		EstimatedMaxAWS:     4500,
 		EstimatedMaxAzure:   4500,
@@ -1710,14 +1710,14 @@ func registerTPCC(r registry.Registry) {
 			Nodes: 3,
 			CPUs:  16,
 
-			LoadWarehousesGCE:   5500,
-			LoadWarehousesAWS:   5500,
-			LoadWarehousesAzure: 5500,
-			LoadWarehousesIBM:   5500,
-			EstimatedMaxGCE:     4500,
-			EstimatedMaxAWS:     4500,
-			EstimatedMaxAzure:   4500,
-			EstimatedMaxIBM:     4500,
+			LoadWarehousesGCE:   6000,
+			LoadWarehousesAWS:   6000,
+			LoadWarehousesAzure: 6000,
+			LoadWarehousesIBM:   6000,
+			EstimatedMaxGCE:     5000,
+			EstimatedMaxAWS:     5000,
+			EstimatedMaxAzure:   5000,
+			EstimatedMaxIBM:     5000,
 			WriteOptimization:   registry.Buffering,
 
 			Clouds: registry.AllClouds,
@@ -1731,15 +1731,15 @@ func registerTPCC(r registry.Registry) {
 			Nodes: 3,
 			CPUs:  16,
 
-			LoadWarehousesGCE:   5500,
-			LoadWarehousesAWS:   5500,
-			LoadWarehousesAzure: 5500,
-			LoadWarehousesIBM:   5500,
-			EstimatedMaxGCE:     4500,
-			EstimatedMaxAWS:     4500,
-			EstimatedMaxAzure:   4500,
-			EstimatedMaxIBM:     4500,
-			WriteOptimization:   registry.PipeliningBuffering,
+			LoadWarehousesGCE:   6000,
+			LoadWarehousesAWS:   6000,
+			LoadWarehousesAzure: 6000,
+			LoadWarehousesIBM:   6000,
+			EstimatedMaxGCE:     5000,
+			EstimatedMaxAWS:     5000,
+			EstimatedMaxAzure:   5000,
+			EstimatedMaxIBM:     5000,
+			WriteOptimization:   registry.Pipelining,
 
 			Clouds: registry.AllClouds,
 			Suites: registry.Suites(registry.Nightly),