Browse Source

Merge "Allow configuration of startup timeout"

Zuul 7 months ago
parent
commit
ef5d89b95d
3 changed files with 5 additions and 2 deletions
  1. 3
    0
      defaults/main.yml
  2. 1
    1
      templates/mysql_defaults.j2
  3. 1
    1
      templates/systemd.timeout.conf.j2

+ 3
- 0
defaults/main.yml View File

@@ -83,6 +83,9 @@ galera_tmp_table_size: 32M
83 83
 
84 84
 galera_file_limits: 65535
85 85
 galera_wait_timeout: 3600
86
+# Increase this value if large SST transfers cause mysql startup to fail due
87
+# to timeout
88
+galera_startup_timeout: 1800
86 89
 
87 90
 ## innodb options
88 91
 galera_innodb_buffer_pool_size: 4096M

+ 1
- 1
templates/mysql_defaults.j2 View File

@@ -10,7 +10,7 @@
10 10
 
11 11
 # How long to wait for successful mysql startup
12 12
 # Startup can take a while if it requires a galera state transfer.
13
-MYSQLD_STARTUP_TIMEOUT=1800
13
+MYSQLD_STARTUP_TIMEOUT={{ galera_startup_timeout }}
14 14
 
15 15
 ulimit -n  {{ calculated_max_connections }}
16 16
 ulimit -Hn  {{ calculated_max_connections }}

+ 1
- 1
templates/systemd.timeout.conf.j2 View File

@@ -3,4 +3,4 @@
3 3
 [Service]
4 4
 # How long to wait for successful mysql startup
5 5
 # Startup can take a while if it requires a galera state transfer.
6
-TimeoutStartSec=1800
6
+TimeoutStartSec={{ galera_startup_timeout }}

Loading…
Cancel
Save