Addressing comments

Author: beautifulentropy

.gitignore

@@ -44,15 +44,10 @@ test/proxysql/*.log*
 # Coverage files
 test/coverage
 
-# Database config symlinks
-sa/db/dbconfig.yml
-test/secrets/backfiller_dburl
+# DSN symlinks
 test/secrets/badkeyrevoker_dburl
 test/secrets/cert_checker_dburl
-test/secrets/expiration_mailer_dburl
 test/secrets/incidents_dburl
-test/secrets/mailer_dburl
-test/secrets/ocsp_responder_dburl
 test/secrets/revoker_dburl
 test/secrets/sa_dburl
 test/secrets/sa_ro_dburl

sa/database_test.go

@@ -17,8 +17,6 @@ import (
 	"github.com/letsencrypt/boulder/test/vars"
 )
 
-var dbHost = os.Getenv("MYSQL_ADDR")
-
 func TestInvalidDSN(t *testing.T) {
 	_, err := DBMapForTest("invalid")
 	test.AssertError(t, err, "DB connect string missing the slash separating the database name")

sa/db-next/dbconfig.mysql8.yml

@@ -0,0 +1 @@
+../db/dbconfig.mysql8.yml

sa/db-next/dbconfig.yml

@@ -1,20 +1,20 @@
 # https://github.com/rubenv/sql-migrate#readme
 boulder_sa_test:
   dialect: mysql
-  datasource: root@tcp(boulder-proxysql:6033)/boulder_sa_test?parseTime=true&max_statement_time=15&long_query_time=12
+  datasource: root@tcp(boulder-proxysql:6033)/boulder_sa_test?parseTime=true
   dir: boulder_sa
 
 boulder_sa_integration:
   dialect: mysql
-  datasource: root@tcp(boulder-proxysql:6033)/boulder_sa_integration?parseTime=true&max_statement_time=15&long_query_time=12
+  datasource: root@tcp(boulder-proxysql:6033)/boulder_sa_integration?parseTime=true
   dir: boulder_sa
 
 incidents_sa_test:
   dialect: mysql
-  datasource: root@tcp(boulder-proxysql:6033)/incidents_sa_test?parseTime=true&max_statement_time=15&long_query_time=12
+  datasource: root@tcp(boulder-proxysql:6033)/incidents_sa_test?parseTime=true
   dir: incidents_sa
 
 incidents_sa_integration:
   dialect: mysql
-  datasource: root@tcp(boulder-proxysql:6033)/incidents_sa_integration?parseTime=true&max_statement_time=15&long_query_time=12
+  datasource: root@tcp(boulder-proxysql:6033)/incidents_sa_integration?parseTime=true
   dir: incidents_sa

sa/db/dbconfig.mariadb.yml

@@ -1,20 +1,20 @@
 # https://github.com/rubenv/sql-migrate#readme
 boulder_sa_test:
   dialect: mysql
-  datasource: root@tcp(boulder-vitess:33577)/boulder_sa_test?parseTime=true&max_execution_time=13000&long_query_time=11
+  datasource: root@tcp(boulder-vitess:33577)/boulder_sa_test?parseTime=true
   dir: boulder_sa
 
 boulder_sa_integration:
   dialect: mysql
-  datasource: root@tcp(boulder-vitess:33577)/boulder_sa_integration?parseTime=true&max_execution_time=13000&long_query_time=11
+  datasource: root@tcp(boulder-vitess:33577)/boulder_sa_integration?parseTime=true
   dir: boulder_sa
 
 incidents_sa_test:
   dialect: mysql
-  datasource: root@tcp(boulder-vitess:33577)/incidents_sa_test?parseTime=true&max_execution_time=13000&long_query_time=11
+  datasource: root@tcp(boulder-vitess:33577)/incidents_sa_test?parseTime=true
   dir: incidents_sa
 
 incidents_sa_integration:
   dialect: mysql
-  datasource: root@tcp(boulder-vitess:33577)/incidents_sa_integration?parseTime=true&max_execution_time=13000&long_query_time=11
+  datasource: root@tcp(boulder-vitess:33577)/incidents_sa_integration?parseTime=true
   dir: incidents_sa

sa/db/dbconfig.mysql8.yml

@@ -1228,14 +1228,6 @@ func (ssa *SQLStorageAuthority) UpdateCRLShard(ctx context.Context, req *sapb.Up
 		nextUpdate = &nut
 	}
 
-	// MariaDB and MySQL 8 handle fractional seconds differently in DATETIME(0)
-	// columns: MariaDB truncates while MySQL rounds to the nearest second. To
-	// ensure both databases store identical values, we explicitly truncate to
-	// whole seconds here. Without this, MySQL could round a timestamp up to the
-	// next second, causing a subsequent update within the same second to appear
-	// "older" and be rejected.
-	thisUpdate := req.ThisUpdate.AsTime().Truncate(time.Second)
-
 	_, err := db.WithTransaction(ctx, ssa.dbMap, func(tx db.Executor) (any, error) {
 		res, err := tx.ExecContext(ctx,
 			`UPDATE crlShards
@@ -1244,12 +1236,12 @@ func (ssa *SQLStorageAuthority) UpdateCRLShard(ctx context.Context, req *sapb.Up
 				AND idx = ?
 				AND (thisUpdate is NULL OR thisUpdate <= ?)
 				LIMIT 1`,
-			thisUpdate,
+			req.ThisUpdate.AsTime(),
 			nextUpdate,
-			thisUpdate,
+			req.ThisUpdate.AsTime(),
 			req.IssuerNameID,
 			req.ShardIdx,
-			thisUpdate,
+			req.ThisUpdate.AsTime(),
 		)
 		if err != nil {
 			return nil, err

sa/sa.go

@@ -105,7 +105,6 @@ func checkMariaDBSystemVariables(name string, value string) error {
 		"max_sort_length":                      {},
 		"max_sp_recursion_depth":               {},
 		"max_statement_time":                   {},
-		"max_execution_time":                   {},
 		"max_user_connections":                 {},
 		"min_examined_row_limit":               {},
 		"mrr_buffer_size":                      {},

sa/sysvars.go

@@ -15,6 +15,7 @@ func TestCheckMariaDBSystemVariables(t *testing.T) {
 
 	for _, tc := range []testCase{
 		{"sql_select_limit", "'0.1", "requires a numeric value"},
+		{"max_statement_time", "0", ""},
 		{"myBabies", "kids_I_tell_ya", "was unexpected"},
 		{"sql_mode", "'STRICT_ALL_TABLES", "string is not properly quoted"},
 		{"sql_mode", "%27STRICT_ALL_TABLES%27", "string is not properly quoted"},

sa/sysvars_test.go

@@ -23,13 +23,9 @@ FILTER=()
 COVERAGE="false"
 COVERAGE_DIR="test/coverage/$(date +%Y-%m-%d_%H-%M-%S)"
 DB_URL_FILES=(
-  backfiller_dburl
   badkeyrevoker_dburl
   cert_checker_dburl
-  expiration_mailer_dburl
   incidents_dburl
-  mailer_dburl
-  ocsp_responder_dburl
   revoker_dburl
   sa_dburl
   sa_ro_dburl
@@ -92,23 +88,20 @@ function run_and_expect_silence() {
 }
 
 configure_database_endpoints() {
-  target_dir="mariadb"
-  dbconfig_target="dbconfig.mariadb.yml"
+  dburl_target_dir="proxysql"
   export DB_ADDR="boulder-proxysql:6033"
 
   if [[ "${USE_VITESS}" == "true" ]]
   then
-    target_dir="mysql8"
-    dbconfig_target="dbconfig.mysql8.yml"
+    dburl_target_dir="vitess"
     export DB_ADDR="boulder-vitess:33577"
   fi
 
-  rm -f "sa/db/dbconfig.yml" test/secrets/*.dburl || true
-  ( cd sa/db && ln -sf "${dbconfig_target}" "dbconfig.yml" )
-
+  # Configure DBURL symlinks
+  rm -f test/secrets/*_dburl || true
   for file in ${DB_URL_FILES:+${DB_URL_FILES[@]+"${DB_URL_FILES[@]}"}}
   do
-    ( cd test/secrets && ln -sf "../dburls/${target_dir}/${file}" "${file}" )
+    ln -sf "dburls/${dburl_target_dir}/${file}" "test/secrets/${file}"
   done
 }
 #