Merge branch 'vitessio:main' into main

ansible/roles/host/tasks/clean.yml

@@ -0,0 +1,23 @@
+# 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/
+        mkdir /tmp
+        chmod 1777 /tmp
+        rm -Rf /root/.ansible/tmp/*
+      changed_when: false

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

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
 	}

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)