MDEV-427/MDEV-5713 Add systemd script with notify functionality

After review/QA fixes.

Author: svoj

cmake/install_layout.cmake

@@ -161,6 +161,7 @@ SET(INSTALL_SUPPORTFILESDIR_RPM "share/mysql")
 SET(INSTALL_MYSQLDATADIR_RPM "/var/lib/mysql")
 
 SET(INSTALL_UNIX_ADDRDIR_RPM "${INSTALL_MYSQLDATADIR_RPM}/mysql.sock")
+SET(INSTALL_SYSTEMD_UNITDIR_RPM "/usr/lib/systemd/system")
 
 #
 # DEB layout
@@ -189,6 +190,8 @@ SET(INSTALL_SUPPORTFILESDIR_DEB "share/mysql")
 SET(INSTALL_MYSQLDATADIR_DEB "/var/lib/mysql")
 
 SET(INSTALL_UNIX_ADDRDIR_DEB "/var/run/mysqld/mysqld.sock")
+SET(INSTALL_SYSTEMD_UNITDIR_DEB "/lib/systemd/system")
+
 #
 # SVR4 layout
 #
@@ -228,7 +231,8 @@ SET(OLD_INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE INTERNAL "")
 # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
 # layout is chosen)
 FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF SYSCONF2
- INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA UNIX_ADDR)
+ INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA UNIX_ADDR
+ SYSTEMD_UNIT)
  SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
  CACHE STRING "${var} installation directory" ${FORCE})
  MARK_AS_ADVANCED(INSTALL_${var}DIR)

cmake/systemd.cmake

@@ -22,9 +22,9 @@ MACRO(CHECK_SYSTEMD)
  IF(WITH_SYSTEMD STREQUAL "yes" OR WITH_SYSTEMD STREQUAL "auto")
  IF(PKG_CONFIG_FOUND)
  IF(WITH_SYSTEMD STREQUAL "yes")
- pkg_check_modules(LIBSYSTEMD REQUIRED libsystemd)
+ pkg_search_module(LIBSYSTEMD REQUIRED libsystemd libsystemd-daemon)
  ELSE()
- pkg_check_modules(LIBSYSTEMD libsystemd)
+ pkg_search_module(LIBSYSTEMD libsystemd libsystemd-daemon)
  ENDIF()
  IF(HAVE_DLOPEN)
  SET(LIBSYSTEMD ${LIBSYSTEMD_LIBRARIES})
@@ -51,17 +51,23 @@ MACRO(CHECK_SYSTEMD)
  CHECK_FUNCTION_EXISTS(sd_listen_fds HAVE_SYSTEMD_SD_LISTEN_FDS)
  CHECK_FUNCTION_EXISTS(sd_notify HAVE_SYSTEMD_SD_NOTIFY)
  CHECK_FUNCTION_EXISTS(sd_notifyf HAVE_SYSTEMD_SD_NOTIFYF)
+ SET(CMAKE_REQUIRED_LIBRARIES)
  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)
- # should be from pkg-config --variable=systemdsystemconfdir systemd
- # Missing CMake macro: http://public.kitware.com/Bug/view.php?id=15634
- SET(SYSTEMD_SYSTEM_CONFDIR /etc/systemd/system)
- # should be from pkg-config --variable=systemdsystemunitdir systemd
- SET(SYSTEMD_SYSTEM_UNITDIR /usr/lib/systemd/system/)
+ SET(SYSTEMD_SCRIPTS mariadb-service-convert)
+ SET(SYSTEMD_DEB_FILES "usr/bin/mariadb-service-convert
+ ${INSTALL_SYSTEMD_UNITDIR}/mariadb.service
+ ${INSTALL_SYSTEMD_UNITDIR}/mariadb@.service
+ ${INSTALL_SYSTEMD_UNITDIR}/mariadb@bootstrap.service.d/wsrep-new-cluster.conf")
+ IF(DEB)
+ SET(SYSTEMD_EXECSTARTPRE "PermissionsStartOnly=true\nExecStartPre=/usr/bin/install -m 755 -o mysql -g root -d /var/run/mysqld")
+ SET(SYSTEMD_EXECSTARTPOST "ExecStartPost=/etc/mysql/debian-start")
+ ENDIF()
  MESSAGE(STATUS "Systemd features enabled")
  ELSE()
  UNSET(LIBSYSTEMD)
+ UNSET(HAVE_SYSTEMD)
  UNSET(HAVE_SYSTEMD_SD_DAEMON_H)
  UNSET(HAVE_SYSTEMD_SD_LISTEN_FDS)
  UNSET(HAVE_SYSTEMD_SD_NOTIFY)

debian/control

@@ -23,7 +23,6 @@ Build-Depends: bison,
  zlib1g-dev (>= 1:1.1.3-5~),
  ${MAYBE_LIBCRACK}
  libjemalloc-dev (>= 3.0.0~) [linux-any]
- libsystemd-daemon-dev | libsystemd-dev, dh-systemd
 Standards-Version: 3.8.2
 Homepage: http://mariadb.org/
 Vcs-Git: https://github.com/MariaDB/server.git

debian/mariadb-server-10.1.files.in

@@ -55,7 +55,6 @@ usr/bin/wsrep_sst_mysqldump
 usr/bin/wsrep_sst_rsync
 usr/bin/wsrep_sst_xtrabackup
 usr/bin/wsrep_sst_xtrabackup-v2
-usr/bin/mariadb-system-convert
 usr/share/doc/mariadb-server-10.1/mysqld.sym.gz
 usr/share/doc/mariadb-server-10.1/INFO_SRC
 usr/share/doc/mariadb-server-10.1/INFO_BIN
@@ -94,3 +93,4 @@ usr/share/mysql/wsrep_notify
 @CASSANDRA_DEB_FILES@
 @SPIDER_DEB_FILES@
 @TOKUDB_DEB_FILES@
+@SYSTEMD_DEB_FILES@

debian/mariadb-server-10.1.postinst

@@ -286,6 +286,12 @@ fi
 
 db_stop # in case invoke failes
 
+# dh_systemd_start doesn't emit anything since we still ship /etc/init.d/mysql.
+# Thus MariaDB server is started via init.d script, which in turn redirects to
+# systemctl. If we upgrade from MySQL mysql.service may be masked, which also
+# means init.d script is disabled. Unmask mysql service explicitely.
+deb-systemd-helper unmask mysql.service >/dev/null || true
+
 #DEBHELPER#
 
 exit 0

debian/rules

@@ -180,12 +180,6 @@ install: build
 install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-10.1/INFO_SRC
 install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.1/INFO_BIN
 
-# systemd helpers
-install -m 0755 scripts/mariadb-service-convert $(TMP)/usr/bin/
-install -d $(TMP)/etc/systemd/system/mariadb@bootstrap.service.d/
-install -m 0644 $(BUILDDIR)/support-files/mariadb-bootstrap.conf \
- $(TMP)/etc/systemd/system/mariadb@bootstrap.service.d/wsrep-new-cluster.conf
-
 # mariadb-test
 mv $(TMP)/usr/mysql-test	$(TMP)/usr/share/mysql
 
@@ -221,10 +215,7 @@ binary-indep: build install
 dh_installexamples -i
 dh_installmenu -i
 dh_installlogrotate -i
-dh_systemd_enable -i support-files/mariadb.service
-dh_systemd_enable --no-enable support-files/mariadb@.service
 dh_installinit -i
-dh_systemd_start -i --restart-after-upgrade mariadb.service
 dh_installcron -i 
 dh_installman -i
 dh_installinfo -i
@@ -250,9 +241,12 @@ binary-arch: build install
 dh_installexamples -a
 dh_installmenu -a
 dh_installlogrotate -a --name mysql-server
+if [ -x /usr/bin/dh_systemd_enable -a -f debian/mariadb-server-10.1/lib/systemd/system/mariadb.service ]; then dh_systemd_enable -pmariadb-server-10.1 mariadb.service; fi
+if [ -x /usr/bin/dh_systemd_enable -a -f debian/mariadb-server-10.1/lib/systemd/system/mariadb@.service ]; then dh_systemd_enable --no-enable -pmariadb-server-10.1 mariadb@.service; fi
 # Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
 # started which might depend on a running database server.
 dh_installinit -a --name=mysql -- defaults 19 21
+if [ -x /usr/bin/dh_systemd_start -a -f debian/mariadb-server-10.1/lib/systemd/system/mariadb.service ]; then dh_systemd_start -pmariadb-server-10.1 --restart-after-upgrade mariadb.service; fi
 dh_installcron -a --name mysql-server
 dh_installman -a
 dh_installinfo -a

include/my_systemd.h

@@ -1,17 +1,34 @@
+/*
+ Copyright (c) 2015 Daniel Black. All rights reserved.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+*/
+
 
 #ifndef MY_SYSTEMD_INCLUDED
 #define MY_SYSTEMD_INCLUDED
 
 #if defined(HAVE_SYSTEMD) && !defined(EMBEDDED_LIBRARY)
+/*
+ sd-daemon.h may include inttypes.h. Explicitly request format macros before
+ the first inclusion of inttypes.h.
+*/
+#define __STDC_FORMAT_MACROS
 #include <systemd/sd-daemon.h>
-
 #else
-
-
-
 #define sd_notify(X, Y)
 #define sd_notifyf(E, F, ...)
-
 #endif
 
 #endif /* MY_SYSTEMD_INCLUDED */

scripts/CMakeLists.txt

@@ -300,7 +300,7 @@ ELSE()
  mysqld_multi
  mysqld_safe
  ${WSREP_BINARIES}
- mariadb-service-convert
+ ${SYSTEMD_SCRIPTS}
  )
  FOREACH(file ${BIN_SCRIPTS})
  IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)

scripts/mariadb-service-convert

@@ -25,14 +25,7 @@
 
 tz_old=$TZ
 
-get_params()
-{
-# does a return so needs to be wrapped in a function
-# . /usr/bin/mysqld_safe --simulate
- . scripts/mysqld_safe --simulate
-}
-
-get_params
+. /usr/bin/mysqld_safe --dry-run
 
 echo "# converted using $0"
 echo "#"
@@ -66,10 +59,11 @@ if [ -n "$mysqld_ld_library_path" ]; then
 fi
 
 if [[ $want_syslog -eq 1 ]]; then
+ echo StandardOutput=syslog
  echo StandardError=syslog
  echo SyslogFacility=daemon
- echo SyslogLevel=error
- echo SyslogLevelPrefix=${syslog_tag_mysqld}
+ echo SyslogLevel=err
+ echo SyslogIdentifier=${syslog_tag_mysqld}
 fi
 
 if [[ "${flush_caches}" -gt 0 ]]; then
@@ -83,4 +77,6 @@ if [[ "${numa_interleave}" -gt 0 ]]; then
  echo
 fi
 
-[ -n "${CRASH_SCRIPT}" ] && echo FailureAction=${CRASH_SCRIPT}
+if [ -n "${CRASH_SCRIPT}" ]; then
+ echo FailureAction=${CRASH_SCRIPT}
+fi

scripts/mysqld_safe.sh

@@ -21,7 +21,7 @@ mysqld_ld_library_path=
 flush_caches=0
 numa_interleave=0
 wsrep_on=0
-simulate=0
+dry_run=0
 
 # Initial logging status: error log is not open, and not using syslog
 logging=init
@@ -82,7 +82,7 @@ Usage: $0 [OPTIONS]
  --malloc-lib=LIB Preload shared library LIB if available
  --mysqld=FILE Use the specified file as mysqld
  --mysqld-version=VERSION Use "mysqld-VERSION" as mysqld
- --simulate Simulate the start to detect errors but don't start
+ --dry-run  Simulate the start to detect errors but don't start
  --nice=NICE Set the scheduling priority of mysqld
  --no-auto-restart Exit after starting mysqld
  --nowatch Exit after starting mysqld
@@ -133,7 +133,7 @@ my_which ()
 }
 
 log_generic () {
- [ $simulate -eq 1 ] && return
+ [ $dry_run -eq 1 ] && return
  priority="$1"
  shift
 
@@ -321,7 +321,7 @@ parse_arguments() {
  MYSQLD="mysqld"
  fi
  ;;
- --simulate) simulate=1 ;;
+ --dry[-_]run) dry_run=1 ;;
  --nice=*) niceness="$val" ;;
  --nowatch|--no[-_]watch|--no[-_]auto[-_]restart) nowatch=1 ;;
  --open[-_]files[-_]limit=*) open_files="$val" ;;
@@ -866,7 +866,7 @@ fi
 #
 # If there exists an old pid file, check if the daemon is already running
 # Note: The switches to 'ps' may depend on your operating system
-if test -f "$pid_file" && [ $simulate -eq 0 ]
+if test -f "$pid_file" && [ $dry_run -eq 0 ]
 then
  PID=`cat "$pid_file"`
  if @CHECK_PID@
@@ -941,9 +941,8 @@ fi
 # ulimit -n 256 > /dev/null 2>&1	# Fix for BSD and FreeBSD systems
 #fi
 
-
 cmd="`mysqld_ld_preload_text`$NOHUP_NICENESS"
-[ $simulate -eq 0 ] && cmd=''
+[ $dry_run -eq 1 ] && cmd=''
 
 #
 # Set mysqld's memory interleave policy.
@@ -963,7 +962,7 @@ then
  fi
 
  # Launch mysqld with numactl.
- [ $simulate -eq 0 ] && cmd="$cmd numactl --interleave=all"
+ [ $dry_run -eq 0 ] && cmd="$cmd numactl --interleave=all"
 elif test $numa_interleave -eq 1
 then
  log_error "--numa-interleave is not supported on this platform"
@@ -976,8 +975,8 @@ do
  cmd="$cmd "`shell_quote_string "$i"`
 done
 cmd="$cmd $args"
+[ $dry_run -eq 1 ] && return
 # Avoid 'nohup: ignoring input' warning
-[ $simulate -eq 0 ] && cmd='true'
 test -n "$NOHUP_NICENESS" && cmd="$cmd < /dev/null"
 
 log_notice "Starting $MYSQLD daemon with databases from $DATADIR"