VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-25 16:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "use environment file in systemd units for _WSREP_START_POSITION"

Browse Source 
This reverts commit 6c40590405.
This commit is contained in:
Andrew Hutchings
2023-08-08 14:01:47 +01:00
committed by Andrew Hutchings
parent 48e6918c94
commit 161ce045a7
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
support-files/CMakeLists.txt
View File

@ -32,8 +32,6 @@ ELSE()
SET(MYSQLD_GROUP "mysql") SET(MYSQLD_GROUP "mysql")
SET(ini_file_extension "cnf") SET(ini_file_extension "cnf")
SET(HOSTNAME "uname -n") SET(HOSTNAME "uname -n")
get_filename_component(MYSQL_UNIX_DIR ${MYSQL_UNIX_ADDR} DIRECTORY)
SET(mysqlunixdir ${MYSQL_UNIX_DIR})
ENDIF() ENDIF()
# XXX: shouldn't we just have variables for all this stuff and centralise # XXX: shouldn't we just have variables for all this stuff and centralise

12
support-files/mariadb.service.in
View File

@ -70,20 +70,20 @@ ProtectSystem=full
# Prevent accessing /home, /root and /run/user # Prevent accessing /home, /root and /run/user
ProtectHome=true ProtectHome=true
# Use an environment file to pass variable _WSREP_START_POSITION # Execute pre and post scripts as root, otherwise it does it as User=
EnvironmentFile=-@mysqlunixdir@/wsrep-start-position PermissionsStartOnly=true
@SYSTEMD_EXECSTARTPRE@ @SYSTEMD_EXECSTARTPRE@
# Perform automatic wsrep recovery. When server is started without wsrep, # Perform automatic wsrep recovery. When server is started without wsrep,
# galera_recovery simply returns an empty string. In any case, however, # galera_recovery simply returns an empty string. In any case, however,
# the script is not expected to return with a non-zero status. # the script is not expected to return with a non-zero status.
# It is always safe to remove @mysqlunixdir@/wsrep-start-position # It is always safe to unset _WSREP_START_POSITION environment variable.
# environment file.
# Do not panic if galera_recovery script is not available. (MDEV-10538) # Do not panic if galera_recovery script is not available. (MDEV-10538)
ExecStartPre=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION"
ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \ ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \
VAR=`cd @bindir@/..; @bindir@/galera_recovery`; [ $? -eq 0 ] \ VAR=`cd @bindir@/..; @bindir@/galera_recovery`; [ $? -eq 0 ] \
&& echo _WSREP_START_POSITION=$VAR > @mysqlunixdir@/wsrep-start-position || exit 1" && systemctl set-environment _WSREP_START_POSITION=$VAR || exit 1"
# Needed to create system tables etc. # Needed to create system tables etc.
# ExecStartPre=@scriptdir@/mysql_install_db -u mysql # ExecStartPre=@scriptdir@/mysql_install_db -u mysql
@ -96,7 +96,7 @@ ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \
ExecStart=@sbindir@/mysqld $MYSQLD_OPTS $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION ExecStart=@sbindir@/mysqld $MYSQLD_OPTS $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION
# Unset _WSREP_START_POSITION environment variable. # Unset _WSREP_START_POSITION environment variable.
ExecStartPost=/bin/rm -f @mysqlunixdir@/wsrep-start-position ExecStartPost=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION"
@SYSTEMD_EXECSTARTPOST@ @SYSTEMD_EXECSTARTPOST@