Merge pull request #505 from vitessio/fix-tpcc

fix sharded keyspaces benchmarks
vitessio · Jan 30, 2024 · 6f2e558 · 6f2e558
2 parents 7cf76ed + 73339eb
commit 6f2e558
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 8 deletions.
diff --git a/ansible/macrobench_sharded_inventory.yml b/ansible/macrobench_sharded_inventory.yml
@@ -64,6 +64,49 @@ all:
         vttablet_max_goproc: 42
       hosts:
         DEVICE_IP_0:
+          # all_tablets is a list of all the possible tablets in the cluster
+          # this list is used to properly clean up the machine from all tablets
+          # if the previous benchmark was a sharded cluster and it had failed
+          # and was not able to clean up correctly, using the unsharded list of
+          # tablets will results in a not complete clean up as we would only remove
+          # two tablets instead of four.
+          all_tablets:
+            - id: 1001
+              keyspace: main
+              shard: 0
+              pool_size: 500
+              transaction_cap: 2000
+              port: 16011
+              grpc_port: 17011
+              mysql_port: 18011
+              mysqld_exporter_port: 9104
+            - id: 1002
+              keyspace: main
+              shard: 0
+              pool_size: 500
+              transaction_cap: 2000
+              port: 16012
+              grpc_port: 17012
+              mysql_port: 18012
+              mysqld_exporter_port: 9105
+            - id: 2001
+              keyspace: main
+              shard: 0
+              pool_size: 500
+              transaction_cap: 2000
+              port: 16021
+              grpc_port: 17021
+              mysql_port: 18021
+              mysqld_exporter_port: 9106
+            - id: 2002
+              keyspace: main
+              shard: 0
+              pool_size: 500
+              transaction_cap: 2000
+              port: 16022
+              grpc_port: 17022
+              mysql_port: 18022
+              mysqld_exporter_port: 9107
           tablets:
             - id: 1001
               keyspace: main

diff --git a/go/server/server.go b/go/server/server.go
@@ -174,14 +174,14 @@ func (s *Server) Init() error {
 	}
 
 	s.benchmarkConfig = map[string]benchmarkConfig{
-		// "micro":         {file: path.Join(s.benchmarkConfigPath, "micro.yaml"), v: viper.New(), skip: true},
-		// "oltp":          {file: path.Join(s.benchmarkConfigPath, "oltp.yaml"), v: viper.New()},
-		// "oltp-set":      {file: path.Join(s.benchmarkConfigPath, "oltp-set.yaml"), v: viper.New()},
-		// "oltp-readonly": {file: path.Join(s.benchmarkConfigPath, "oltp-readonly.yaml"), v: viper.New()},
-		//
-		// // TODO: oltp-readonly-olap benchmarks are skipped for now as they fail very often due to
-		// // MySQL connections being dropped. This issue will be investigated soon.
-		// "oltp-readonly-olap": {file: path.Join(s.benchmarkConfigPath, "olap-readonly.yaml"), v: viper.New(), skip: true},
+		"micro":         {file: path.Join(s.benchmarkConfigPath, "micro.yaml"), v: viper.New(), skip: true},
+		"oltp":          {file: path.Join(s.benchmarkConfigPath, "oltp.yaml"), v: viper.New()},
+		"oltp-set":      {file: path.Join(s.benchmarkConfigPath, "oltp-set.yaml"), v: viper.New()},
+		"oltp-readonly": {file: path.Join(s.benchmarkConfigPath, "oltp-readonly.yaml"), v: viper.New()},
+
+		// TODO: oltp-readonly-olap benchmarks are skipped for now as they fail very often due to
+		// MySQL connections being dropped. This issue will be investigated soon.
+		"oltp-readonly-olap": {file: path.Join(s.benchmarkConfigPath, "olap-readonly.yaml"), v: viper.New(), skip: true},
 
 		"tpcc":              {file: path.Join(s.benchmarkConfigPath, "tpcc.yaml"), v: viper.New()},
 		"tpcc_unsharded":    {file: path.Join(s.benchmarkConfigPath, "tpcc_unsharded.yaml"), v: viper.New()},