diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-22 19:06:32 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-22 19:06:32 -0400 |
commit | 3ac0721a3c8eecf8843b527cdc4d08c20edb6268 (patch) | |
tree | e2b3ba3c009ef7518d7029fa96ef9a7335274335 /support-files/mariadb.service.in | |
parent | 294961cc4d4d55730e807b3f0a7f93a3dd4d4f7b (diff) | |
download | mariadb-git-3ac0721a3c8eecf8843b527cdc4d08c20edb6268.tar.gz |
MDEV-10507: MariaDB 10.1 + wsrep fails to start under systemd post-reboot
/var/run/mysqld must be created before wsrep recovery.
Diffstat (limited to 'support-files/mariadb.service.in')
-rw-r--r-- | support-files/mariadb.service.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in index 9b97172e1b5..15f41c6377f 100644 --- a/support-files/mariadb.service.in +++ b/support-files/mariadb.service.in @@ -59,6 +59,8 @@ ProtectHome=true # Execute pre and post scripts as root, otherwise it does it as User= PermissionsStartOnly=true +@SYSTEMD_EXECSTARTPRE@ + # Perform automatic wsrep recovery. When server is started without wsrep, # galera_recovery simply returns an empty string. In any case, however, # the script is not expected to return with a non-zero status. @@ -77,7 +79,6 @@ ExecStartPre=/bin/sh -c "[ ! -e /usr/bin/galera_recovery ] && VAR= || \ # Use the [service] section and Environment="MYSQLD_OPTS=...". # This isn't a replacement for my.cnf. # _WSREP_NEW_CLUSTER is for the exclusive use of the script galera_new_cluster -@SYSTEMD_EXECSTARTPRE@ ExecStart=/usr/sbin/mysqld $MYSQLD_OPTS $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION @SYSTEMD_EXECSTARTPOST@ |