sa: Stop injecting max_statement_time and long_query_time into DSNs#8490
Merged
beautifulentropy merged 4 commits intomainfrom Nov 22, 2025
Merged
sa: Stop injecting max_statement_time and long_query_time into DSNs#8490beautifulentropy merged 4 commits intomainfrom
beautifulentropy merged 4 commits intomainfrom
Conversation
jsha
reviewed
Nov 14, 2025
Contributor
jsha
left a comment
jsha
left a comment
There was a problem hiding this comment.
FYI, I checked configs and currently we have max_statement_time=0 in our prod DSNs.
jprenken
previously approved these changes
Nov 21, 2025
jsha
requested changes
Nov 21, 2025
beautifulentropy
force-pushed
the
mysql8-says-no-max-statement-time
branch
from
a0c6c16 to
71d49e5
Compare
| []byte("sa@tcp("+dbAddr+")/boulder_sa_integration"), | ||
| os.ModeAppend) | ||
|
|
||
| err := os.WriteFile(dsnFile, []byte(vars.DBConnSA), os.ModeAppend) |
Member
Author
There was a problem hiding this comment.
I'm not strictly sticking to boulder_sa_integration here, but I believe its prior use to be erroneous; this is a unit test, after all.
jprenken
approved these changes
Nov 21, 2025
jsha
approved these changes
Nov 21, 2025
npurtova
pushed a commit
to plesk/boulder
that referenced
this pull request
Nov 25, 2025
aarongable
pushed a commit
that referenced
this pull request
Dec 8, 2025
The original plan for getting the Vitess infrastructure running was to use [vttestserver](https://vitess.io/docs/22.0/reference/programs/vttestserver) as a starting point to reach a minimum viable setup. However, vttestserver didn’t work out because some of its defaults conflicted with how we clean up rows and the level of resources (threads) we need. Fortunately, vttestserver is just a wrapper around [vtcombo](https://vitess.io/docs/21.0/reference/programs/vtcombo) that generates a [vttest protobuf](https://github.com/vitessio/vitess/blob/v22.0.1/proto/vttest.proto) describing the configuration for an in-memory topology server started by vtcombo, encoded in JSON. By modifying vttestserver’s [run.sh](https://github.com/vitessio/vitess/blob/v22.0.1/docker/vttestserver/run.sh), we're able to interact with vtcombo directly, passing the JSON configuration along with other vttestserver defaults reverse-engineered from run.sh and [vtprocess.go](https://github.com/vitessio/vitess/blob/v22.0.1/go/vt/vttest/vtprocess.go). Vitess doesn’t provide a `vtcombo` image, we must build our own. Build and upload a [boulder-vtcomboserver image](https://hub.docker.com/repository/docker/letsencrypt/boulder-vtcomboserver) on top of Docker's official MySQL 8.4 image, which provides native arm64 support. The accompanying tag-and-upload shell script defaults to amd64 for CI. As an aside, Vitess’s official Dockerfiles are only published for amd64, and modifying them to build for arm64 would prove difficult because Oracle doesn’t publish MySQL arm64 binaries in its [Debian apt repository](https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community). With boulder-vtcomboserver up and running I was able to find/validate the following issues and provide workarounds: - **Problem:** db-migrate, the tool we use to apply database migrations, must be configured to talk to MariaDB and to MySQL through Vitess (vtgate + vttablet). **Solution:** Create two new dbconfig YAML files (mariadb and vitess) and use `test/entrypoint.sh` to set the appropriate file for `sql-migrate` (`test/create_db.sh`) to use. Also, symlink each of these two new files from db to db-next just like the old dbconfig.yml file. - **Problem:** Vitess does not allow database `CREATE` statements and any DDL containing them will be rejected by vtgate. **Solution:** These databases are already created by vtcombo since they’re defined as KEYSPACES. Skip database creation in `test/create_db.sh`. - **Problem:** Vitess does not allow user creation or grants (`CREATE USER`, `GRANT`), and any DDL containing these commands will be blocked by vtgate. **Solution:** Skip user creation and grant steps in `test/create_db.sh`. Set `%` for `--vschema_ddl_authorized_users` as vttestserver does, and revisit this later for a more complete approach. - **Problem:** vttablet default for maximum number of rows returned from a (non-streaming) query (10,000) is too low for Boulder’s needs, causing queries to fail due to vttablet rejecting them. **Solution:** Increase `--queryserver-config-max-result-size` to 1,000,000 and `--queryserver-config-warn-result-size` to 1,000,000. - **Problem:** vttablet default for connection pool size (16) and maximum number of concurrent transactions (20) are too low for Boulder’s needs, causing queries to fail due to vttablet being overloaded. **Solution:** Increase `--queryserver-config-pool-size` to 64 and `--queryserver-config-transaction-cap` to 80. - **Problem:** Vitess does not allow `TRIGGER` statements and any DDL containing them will be rejected by vtgate. Without TRIGGER statements TestIssuanceCertStorageFailed, an integration test, will fail. **Soluton:** Run these TRIGGER statements in an entrypoint scripttest/vtcomboserver/install_trigger.sh, bypassing vtgate entirely. Depends on #8479 Depends on #8489 Depends on #8490 Depends on #8494 Fixes #7736
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ahead of the move from ProxySQL + MariaDB to Vitess + MySQL 8 in #8468: stop injecting
max_statement_time, which in MySQL is replaced bymax_execution_time, and stop derivinglong_query_timefrom it.Unconditionally omit
max_execution_timeandmax_statement_timesystem variables. This functionality is not needed in Dev/CI and is managed by ProxySQL and/or Vitess in Production.Also, where we define DSNs in our tests, do not hardcode the address (host:port) of the database (as boulder-proxysql:6033). Instead, populate it from a new environment variable,
DB_ADDR, and panic in tests ifDB_ADDRis missing or cannot be parsed as a host and port vianet.SplitHostPort.Lastly, remove the following secrets (mostly DSNs) as they're no longer in use:
Part of #7736