add mysql timeout env (#4584)

alchemy-fr · Feb 19, 2025 · 3495492 · 3495492
1 parent e3789b6
commit 3495492
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/.env b/.env
@@ -522,6 +522,14 @@ MYSQL_QUERY_CACHE_SIZE=64M
 # @run
 MYSQL_KEY_BUFFER_SIZE=128M
 
+# Value applied to "connect_timeout" MySQL server setting.
+# @run
+MYSQL_CONNECT_TIMEOUT=60
+
+# Value applied to "wait_timeout" MySQL server setting.
+# @run
+MYSQL_WAIT_TIMEOUT=600
+
 # This Environment variable will run mariadb-upgrade is essential when mariadb version changes.
 # @run
 MARIADB_AUTO_UPGRADE=1

diff --git a/docker-compose.altenatives.yml b/docker-compose.altenatives.yml
@@ -24,6 +24,8 @@ services:
     - MYSQL_QUERY_CACHE_LIMIT
     - MYSQL_QUERY_CACHE_SIZE
     - MYSQL_KEY_BUFFER_SIZE
+    - MYSQL_CONNECT_TIMEOUT
+    - MYSQL_WAIT_TIMEOUT
     volumes:
     - ${PHRASEANET_DB_DIR}_mysql8:/var/lib/mysql:rw
     networks:

diff --git a/docker-compose.datastores.yml b/docker-compose.datastores.yml
@@ -15,6 +15,8 @@ services:
     - MYSQL_QUERY_CACHE_LIMIT
     - MYSQL_QUERY_CACHE_SIZE
     - MYSQL_KEY_BUFFER_SIZE
+    - MYSQL_CONNECT_TIMEOUT
+    - MYSQL_WAIT_TIMEOUT
     - MARIADB_AUTO_UPGRADE
     volumes:
     - ${PHRASEANET_DB_DIR}:/var/lib/mysql

diff --git a/docker/db/docker/custom.cnf b/docker/db/docker/custom.cnf
@@ -10,4 +10,7 @@ slow_query_log=$MYSQL_SLOW_QUERY_LOG
 query_cache_limit=$MYSQL_QUERY_CACHE_LIMIT
 query_cache_size=$MYSQL_QUERY_CACHE_SIZE
 
-key_buffer_size=$MYSQL_KEY_BUFFER_SIZE
+key_buffer_size=$MYSQL_KEY_BUFFER_SIZE
+
+connect_timeout=$MYSQL_CONNECT_TIMEOUT
+wait_timeout=$MYSQL_WAIT_TIMEOUT