Merge pull request #614 from vitessio/minimize-benchrun

removed oltp-set run
vitessio · Nov 6, 2024 · 513ddb9 · 513ddb9
2 parents 90d8763 + 847907a
commit 513ddb9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 64 deletions.
diff --git a/config/benchmarks/olap-readonly.yaml b/config/benchmarks/olap-readonly.yaml
@@ -41,7 +41,5 @@ macrobench_run_warmup-time: 20
 
 # Vitess Extra Flags
 exec-vitess-config:
-  12: # will match >= v12.0.0
-    vtgate: -mysql_default_workload=OLAP
   14: # will match >= v14.0.0
     vtgate: --mysql_default_workload=OLAP
diff --git a/config/benchmarks/oltp-set.yaml b/config/benchmarks/oltp-set.yaml
diff --git a/go/admin/templates/add_new_executions.html b/go/admin/templates/add_new_executions.html
@@ -34,6 +34,8 @@
           />
           All</label
         >
+      </div>
+      <div class="flex flex-col">
         <label
           ><input
             class="accent-orange-500"
@@ -52,17 +54,6 @@
           />
           OLTP-READONLY</label
         >
-        <label
-          ><input
-            class="accent-orange-500"
-            type="checkbox"
-            name="workloads"
-            value="OLTP-SET"
-          />
-          OLTP-SET</label
-        >
-      </div>
-      <div class="flex flex-col">
         <label
           ><input
             class="accent-orange-500"

diff --git a/go/server/server.go b/go/server/server.go
@@ -182,24 +182,24 @@ 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},
+		// "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()},
-		"tpcc_fk":           {file: path.Join(s.benchmarkConfigPath, "tpcc_fk.yaml"), v: viper.New()},
-		"tpcc_fk_unmanaged": {file: path.Join(s.benchmarkConfigPath, "tpcc_fk_unmanaged.yaml"), v: viper.New()},
+		"tpcc_unsharded":    {file: path.Join(s.benchmarkConfigPath, "tpcc_unsharded.yaml"), v: viper.New(), skip: true},
+		"tpcc_fk":           {file: path.Join(s.benchmarkConfigPath, "tpcc_fk.yaml"), v: viper.New(), skip: true},
+		"tpcc_fk_unmanaged": {file: path.Join(s.benchmarkConfigPath, "tpcc_fk_unmanaged.yaml"), v: viper.New(), skip: true},
 	}
 	for workload, config := range s.benchmarkConfig {
 		config.v.SetConfigFile(config.file)
 		if err := config.v.ReadInConfig(); err != nil {
 			slog.Error(err)
 		}
-		if workload == "micro" {
+		// skipping tpcc unsharded and fk workload for comparison
+		if workload == "micro" || strings.Contains(workload, "tpcc_") {
 			continue
 		}
 		s.workloads = append(s.workloads, strings.ToUpper(workload))