Skip to content

Commit

Permalink
removed oltp-set run
Browse files Browse the repository at this point in the history
Signed-off-by: Harshit Gangal <[email protected]>
  • Loading branch information
harshit-gangal committed Nov 6, 2024
1 parent 90d8763 commit fa89950
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 53 deletions.
8 changes: 3 additions & 5 deletions config/benchmarks/olap-readonly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ exec-workload: oltp-readonly-olap
exec-schema: "./vitess-benchmark/sysbench.json"

## Minimum Vitess version on which the benchmark should be executed
minimum-version: 14
minimum-version: 18

## Ansible
ansible-inventory-file: macrobench_sharded_inventory.yml
Expand Down Expand Up @@ -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
18: # will match >= v19.0.0
vtgate: -mysql_default_workload=OLAP
45 changes: 0 additions & 45 deletions config/benchmarks/oltp-set.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions go/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,11 @@ 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()},
Expand All @@ -199,7 +198,8 @@ func (s *Server) Init() error {
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))
Expand Down

0 comments on commit fa89950

Please sign in to comment.