From fa89950f9c7607037ae29463bb5de8d4e5e65a7e Mon Sep 17 00:00:00 2001 From: Harshit Gangal Date: Wed, 6 Nov 2024 15:44:25 +0530 Subject: [PATCH 1/4] removed oltp-set run Signed-off-by: Harshit Gangal --- config/benchmarks/olap-readonly.yaml | 8 ++--- config/benchmarks/oltp-set.yaml | 45 ---------------------------- go/server/server.go | 6 ++-- 3 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 config/benchmarks/oltp-set.yaml diff --git a/config/benchmarks/olap-readonly.yaml b/config/benchmarks/olap-readonly.yaml index 578afd6ee..bae7a1792 100644 --- a/config/benchmarks/olap-readonly.yaml +++ b/config/benchmarks/olap-readonly.yaml @@ -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 @@ -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 \ No newline at end of file + 18: # will match >= v19.0.0 + vtgate: -mysql_default_workload=OLAP \ No newline at end of file diff --git a/config/benchmarks/oltp-set.yaml b/config/benchmarks/oltp-set.yaml deleted file mode 100644 index 2429805f4..000000000 --- a/config/benchmarks/oltp-set.yaml +++ /dev/null @@ -1,45 +0,0 @@ -## Exec Config -exec-workload: oltp-set -exec-schema: "./vitess-benchmark/sysbench.json" - -## Minimum Vitess version on which the benchmark should be executed -minimum-version: 14 - -## Ansible -ansible-inventory-file: macrobench_sharded_inventory.yml -ansible-playbook-file: macrobench.yml - -## Macrobench cmd -macrobench-sysbench-executable: /usr/local/bin/sysbench -macrobench-workload-path: oltp_read_write_with_settings -macrobench-skip-steps: -macrobench-workload: oltp-set - -## Sysbench all steps -macrobench_all_mysql-db: main -macrobench_all_mysql-host: 127.0.0.1 -macrobench_all_mysql-port: 13306 -macrobench_all_db-ps-mode: disable -macrobench_all_db-driver: mysql -macrobench_all_luajit-cmd: "off" -macrobench_all_threads: 42 -macrobench_all_auto-inc: "off" -macrobench_all_tables: 10 -macrobench_all_table_size: 10000 -macrobench_all_rand-type: uniform -macrobench_all_rand-seed: 1 - -## Sysbench prepare step -macrobench_prepare_time: 10 -macrobench_prepare_report-interval: 10 - -## Sysbench run step -macrobench_run_time: 60 -macrobench_run_report_json: true -macrobench_run_verbosity: 0 -macrobench_run_warmup-time: 20 - -# Vitess Extra Flags -exec-vitess-config: - 15: # will match >= v15.0.0 and override the flags defined in < 15.0.0 - vttablet: --queryserver-enable-settings-pool=true diff --git a/go/server/server.go b/go/server/server.go index 99df4ff3f..69e34ea3d 100644 --- a/go/server/server.go +++ b/go/server/server.go @@ -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()}, @@ -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)) From 8c6f2c1a722d491770c099dc02a769c682831b21 Mon Sep 17 00:00:00 2001 From: Harshit Gangal Date: Wed, 6 Nov 2024 15:48:29 +0530 Subject: [PATCH 2/4] fix default Signed-off-by: Harshit Gangal --- config/benchmarks/olap-readonly.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/benchmarks/olap-readonly.yaml b/config/benchmarks/olap-readonly.yaml index bae7a1792..0e6f9a787 100644 --- a/config/benchmarks/olap-readonly.yaml +++ b/config/benchmarks/olap-readonly.yaml @@ -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: 18 +minimum-version: 14 ## Ansible ansible-inventory-file: macrobench_sharded_inventory.yml @@ -41,5 +41,5 @@ macrobench_run_warmup-time: 20 # Vitess Extra Flags exec-vitess-config: - 18: # will match >= v19.0.0 - vtgate: -mysql_default_workload=OLAP \ No newline at end of file + 14: # will match >= v14.0.0 + vtgate: --mysql_default_workload=OLAP \ No newline at end of file From 9f5bfc04a90f619cf33c70436df5a3e9b65755f8 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 6 Nov 2024 11:50:49 -0600 Subject: [PATCH 3/4] update admin with proper list of workflows Signed-off-by: Florent Poinsard --- go/admin/templates/add_new_executions.html | 25 +++++++--------------- go/server/server.go | 6 +++--- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/go/admin/templates/add_new_executions.html b/go/admin/templates/add_new_executions.html index 6fa2178c5..a3fea3178 100644 --- a/go/admin/templates/add_new_executions.html +++ b/go/admin/templates/add_new_executions.html @@ -34,13 +34,15 @@ /> All + +
- -
-