summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-06-27 18:03:24 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-06-27 18:03:24 -0400
commita6816995ee6cc3dc0508e35fc2da4921b53fb931 (patch)
treeb6cb2e7cf90eb77229ab353c49e5ed198c147bf0 /cmake
parent064569906083b24fc980e044cbb3b3427768249f (diff)
downloadmariadb-git-a6816995ee6cc3dc0508e35fc2da4921b53fb931.tar.gz
MDEV-10004: Galera's pc.recovery process fails in 10.1 with systemd
Galera recovery process works in two phases. In the first phase, mysqld is started as non-daemon with --wsrep-recover to recover and fetch the last logged global transaction ID. This ID is then used in second phase as the start position (--wsrep-start-position=XX) to start mysqld as daemon. As this process was implemented in mysqld_safe script, the recovery did not work when server was started using systemd. Fixed by introducing a shell script (wsrep_recovery.sh) that mimics the first phase of the recovery process.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/systemd.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/systemd.cmake b/cmake/systemd.cmake
index b0161cf9114..17f44f76634 100644
--- a/cmake/systemd.cmake
+++ b/cmake/systemd.cmake
@@ -55,9 +55,10 @@ MACRO(CHECK_SYSTEMD)
IF(HAVE_SYSTEMD AND HAVE_SYSTEMD_SD_DAEMON_H AND HAVE_SYSTEMD_SD_LISTEN_FDS
AND HAVE_SYSTEMD_SD_NOTIFY AND HAVE_SYSTEMD_SD_NOTIFYF)
ADD_DEFINITIONS(-DHAVE_SYSTEMD)
- SET(SYSTEMD_SCRIPTS mariadb-service-convert galera_new_cluster)
+ SET(SYSTEMD_SCRIPTS mariadb-service-convert galera_new_cluster galera_recovery)
SET(SYSTEMD_DEB_FILES "usr/bin/mariadb-service-convert
usr/bin/galera_new_cluster
+ usr/bin/galera_recovery
${INSTALL_SYSTEMD_UNITDIR}/mariadb.service
${INSTALL_SYSTEMD_UNITDIR}/mariadb@.service
${INSTALL_SYSTEMD_UNITDIR}/mariadb@bootstrap.service.d/use_galera_new_cluster.conf")