ensure mysql defaults file is sourced

The mysql initscript that comes with mariadb-10.0 does not source the
/etc/default/mysql file, meaning that the MYSQLD_STARTUP_TIMEOUT that
we set in there is being ignored.  This has the effect of causing some
nodes to timeout their startup too early, interrupting the initial SST,
and causing the cluster join to fail.

This commit adds a line to the initscript to ensure that we are
sourcing /etc/default/mysql correctly.

Closes-Bug: #1569446
Co-Authored-By: Jimmy McCrory <jimmy.mccrory@gmail.com>

Change-Id: I6af1cc660c2bbc2a49707cfab995659dc0167f2f
(cherry picked from commit b9a7361b28)
This commit is contained in:
Darren Birkett 2016-04-15 09:12:32 +01:00
parent 3f176052c9
commit a743ea9689
1 changed files with 12 additions and 0 deletions

View File

@ -55,6 +55,18 @@
tags:
- galera-client-user-config
# NOTE: (mancdaz) this should not be needed with mariadb-10.1 since its
# initscript sources /etc/default/mariadb
- name: fix mysql startup timeout
lineinfile:
dest: /etc/init.d/mysql
state: present
insertafter: '^export HOME=/etc/mysql/'
line: '[ -r /etc/default/mysql ] && . /etc/default/mysql'
backup: yes
# NOTE: (mancdaz) The target will need to change to /etc/default/mariadb
# for mariadb-10.1
- name: Drop mariadb config(s)
template:
src: "mysql_defaults.j2"