From 3e091d6cf1cd814fd96817a3b3491703048c19ce Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 9 Oct 2023 17:14:08 -0600 Subject: [PATCH 1/4] Decrease timeout to 1h Signed-off-by: Florent Poinsard --- go/server/cron_execution.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/server/cron_execution.go b/go/server/cron_execution.go index a70d20f9a..0c6068a67 100644 --- a/go/server/cron_execution.go +++ b/go/server/cron_execution.go @@ -70,7 +70,7 @@ func (s *Server) executeSingle(config benchmarkConfig, identifier executionIdent return nErr } - timeout := 2 * time.Hour + timeout := 1 * time.Hour if identifier.BenchmarkType == "micro" { timeout = 4 * time.Hour } From 5456a9135182d3261aa9005dd8fe72283edc165f Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 9 Oct 2023 17:56:18 -0600 Subject: [PATCH 2/4] Clean up tmp directories on host Signed-off-by: Florent Poinsard --- ansible/roles/host/tasks/clean.yml | 21 +++++++++++++++++++++ ansible/teardown_cluster.yml | 5 +++++ 2 files changed, 26 insertions(+) create mode 100644 ansible/roles/host/tasks/clean.yml diff --git a/ansible/roles/host/tasks/clean.yml b/ansible/roles/host/tasks/clean.yml new file mode 100644 index 000000000..910e39d2b --- /dev/null +++ b/ansible/roles/host/tasks/clean.yml @@ -0,0 +1,21 @@ +# Copyright 2023 The Vitess Authors. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +- name: Clean host + become: yes + become_user: root + block: + - name: Remove tmp directories + shell: | + rm -Rf /tmp/* + rm -Rf /root/.ansible/tmp/* + changed_when: false diff --git a/ansible/teardown_cluster.yml b/ansible/teardown_cluster.yml index 6bc7b86cb..9458f4ffd 100644 --- a/ansible/teardown_cluster.yml +++ b/ansible/teardown_cluster.yml @@ -14,6 +14,11 @@ hosts: - all tasks: + - name: Clean host + include_role: + name: host + tasks_from: clean + - name: Stop sysbench include_role: name: sysbench From 7cffa508b89724ee402371b71e95edeed4af8fcd Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 9 Oct 2023 17:59:19 -0600 Subject: [PATCH 3/4] Skip oltp-readonly-olap Signed-off-by: Florent Poinsard --- go/server/server.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/go/server/server.go b/go/server/server.go index 9e5e08935..b5c9d4460 100644 --- a/go/server/server.go +++ b/go/server/server.go @@ -169,12 +169,16 @@ 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()}, - "oltp-readonly-olap": {file: path.Join(s.benchmarkConfigPath, "olap-readonly.yaml"), v: viper.New()}, - "tpcc": {file: path.Join(s.benchmarkConfigPath, "tpcc.yaml"), v: viper.New()}, + "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()}, } for configName, config := range s.benchmarkConfig { config.v.SetConfigFile(config.file) From 8bd00c5defa95a66ec29a2f3c4db5e509a263c9a Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 9 Oct 2023 18:18:51 -0600 Subject: [PATCH 4/4] chmod on host tmp folder Signed-off-by: Florent Poinsard --- ansible/roles/host/tasks/clean.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible/roles/host/tasks/clean.yml b/ansible/roles/host/tasks/clean.yml index 910e39d2b..acfe0dadb 100644 --- a/ansible/roles/host/tasks/clean.yml +++ b/ansible/roles/host/tasks/clean.yml @@ -16,6 +16,8 @@ block: - name: Remove tmp directories shell: | - rm -Rf /tmp/* + rm -Rf /tmp/ + mkdir /tmp + chmod 1777 /tmp rm -Rf /root/.ansible/tmp/* changed_when: false