Run on v18 and use proper v18 flags

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
vitessio · Jun 25, 2024 · 7aec68a · 7aec68a
1 parent 2628489
commit 7aec68a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/ansible/roles/vttablet/templates/vttablet.conf.j2 b/ansible/roles/vttablet/templates/vttablet.conf.j2
@@ -31,9 +31,15 @@ EXTRA_VTTABLET_FLAGS="--alsologtostderr \
     --queryserver-config-pool-size={{ tablet.connection_pool_size | default(vttablet_connection_pool_size) }} \
     --queryserver-config-stream-pool-size={{ tablet.stream_pool_size | default(vttablet_stream_pool_size) }} \
     --queryserver-config-transaction-cap={{ tablet.transaction_cap | default(vttablet_transaction_cap) }} \
-    --queryserver-config-query-timeout=900s \
-    --queryserver-config-schema-reload-time=60s \
-    --queryserver-config-transaction-timeout=300s \
+    {% if vitess_major_version <= 18 %}
+      --queryserver-config-query-timeout=900 \
+      --queryserver-config-schema-reload-time=60 \
+      --queryserver-config-transaction-timeout=300 \
+    {% else %}
+      --queryserver-config-query-timeout=900s \
+      --queryserver-config-schema-reload-time=60s \
+      --queryserver-config-transaction-timeout=300s \
+    {% endif %}
     --grpc_max_message_size=67108864 \
     --db_charset=utf8 \
     {% if pprof_targets is defined %}

diff --git a/go/exec/exec.go b/go/exec/exec.go
@@ -391,6 +391,7 @@ func (e *Exec) prepareAnsibleForExecution() error {
 		e.AnsibleConfig.AddExtraVar(ansible.KeyVitessVersionPRNumber, e.PullNB)
 	}
 	e.AnsibleConfig.AddExtraVar(ansible.KeyVtgatePlanner, e.VtgatePlannerVersion)
+	e.AnsibleConfig.AddExtraVar(ansible.KeyVitessMajorVersion, e.VitessVersion.Major)
 	e.AnsibleConfig.AddExtraVar(ansible.KeyVitessSchema, e.vitessSchemaPath)
 	e.vitessConfig.addToAnsible(&e.AnsibleConfig)
 

diff --git a/go/infra/ansible/vars.go b/go/infra/ansible/vars.go
@@ -70,6 +70,10 @@ const (
 	// number that the execution will benchmark.
 	KeyVitessVersionPRNumber = "vitess_git_version_pr_nb"
 
+	// KeyVitessMajorVersion corresponding value in the map is an int set to the major
+	// release increment of Vitess.
+	KeyVitessMajorVersion = "vitess_major_version"
+
 	// KeyVtgatePlanner corresponding value in the map is the query planner version
 	// that will be used to execute the benchmark.
 	KeyVtgatePlanner = "vitess_planner_version"

diff --git a/go/tools/git/git.go b/go/tools/git/git.go
@@ -138,9 +138,7 @@ func GetLatestVitessReleaseCommitHash(repoDir string) ([]*Release, error) {
 	}
 	var latestReleases []*Release
 
-	// We take the 2 latest major release
-	// TODO: @Florent: use the three latest major releases once v17 is out
-	minimumRelease := allReleases[0].Version.Major - 1
+	minimumRelease := allReleases[0].Version.Major - 2
 	for _, release := range allReleases {
 		if release.Version.Major >= minimumRelease {
 			latestReleases = append(latestReleases, release)
@@ -205,8 +203,7 @@ func GetLatestVitessReleaseBranchCommitHash(repoDir string) ([]*Release, error)
 	}
 	var latestReleaseBranches []*Release
 	// We take the 2 latest major release
-	// TODO: @Florent: use the three latest major releases once v17 is out
-	minimumRelease := res[0].Version.Major - 1
+	minimumRelease := res[0].Version.Major - 2
 	for _, release := range res {
 		if release.Version.Major >= minimumRelease {
 			latestReleaseBranches = append(latestReleaseBranches, release)