Mdev 5536 systemd socket activation notification

config.h.cmake

@@ -117,6 +117,7 @@
 #cmakedefine HAVE_LIBCRYPT 1
 #cmakedefine HAVE_LIBMTMALLOC 1
 #cmakedefine HAVE_LIBWRAP 1
+#cmakedefine HAVE_SYSTEMD 1
 /* Does "struct timespec" have a "sec" and "nsec" field? */
 #cmakedefine HAVE_TIMESPEC_TS_SEC 1
 

configure.cmake

@@ -161,6 +161,33 @@ IF(UNIX)
       SET(LIBWRAP "wrap")
     ENDIF()
   ENDIF()
+
+  SET(WITH_SYSTEMD "auto" CACHE STRING "Compile with systemd notification on ready")
+  IF(NOT ${WITH_SYSTEMD} MATCHES "[Nn][Oo]")
+    SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} systemd-daemon)
+    CHECK_C_SOURCE_COMPILES(
+    "
+    #include <systemd/sd-daemon.h>
+    int main()
+    {
+      sd_listen_fds(0);
+    }"
+    HAVE_SYSTEMD)
+    CHECK_INCLUDE_FILES (systemd/sd-daemon.h HAVE_SYSTEMD_SD_DAEMON_H)
+    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)
+    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)
+      SET(LIBSYSTEMD "systemd-daemon")
+      MESSAGE(STATUS "Systemd features enabled")
+    ELSE()
+      MESSAGE(STATUS "Systemd features not enabled")
+      IF(${WITH_SYSTEMD} MATCHES "[Yy][Ee][Ss]")
+        MESSAGE(FATAL_ERROR "Requested WITH_SYSTEMD=YES however no dependencies installed/found")
+      ENDIF()
+    ENDIF()
+  ENDIF()
 ENDIF()
 
 #

debian/dist/Debian/control

@@ -9,7 +9,8 @@ Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6),
                zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV},
                libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath,
                dpatch, gawk, bison, lsb-release, hardening-wrapper,
-               ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
+               ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0),
+               libsystemd-daemon-dev, dh-systemd
 Standards-Version: 3.8.3
 Homepage: http://mariadb.org/
 Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
@@ -161,7 +162,7 @@ Description: MariaDB database client binaries
 
 Package: mariadb-server-core-10.0
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version}), libsystemd-daemon0
 Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
 Conflicts: mysql-server-5.0, mysql-server-core-5.0,
     mariadb-server-core-5.1, mysql-server-core-5.1,

debian/dist/Debian/mariadb-server-10.0.files.in

@@ -43,6 +43,9 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
+usr/bin/mariadb-socket-convert
+usr/bin/mariadb-system-convert
+usr/bin/mariadb-systemd-start
 usr/share/doc/mariadb-server-10.0/mysqld.sym.gz
 usr/share/doc/mariadb-server-10.0/INFO_SRC
 usr/share/doc/mariadb-server-10.0/INFO_BIN

debian/dist/Debian/mariadb-server-10.0.postinst

@@ -260,6 +260,19 @@ if [ "$1" = "configure" ]; then
                db_go
        fi
 
+       # create a systemd socket activation file based on current settings
+       systemd_sockconf=/etc/systemd/system/mariadb.socket.d/migrated-from-my.cnf-settings.conf
+       if [ -x /usr/bin/mariadb-socket-convert  -a ! -f "${systemd_sockconf}" ]; then
+               mkdir -p /etc/systemd/system/mariadb.socket.d
+               /usr/bin/mariadb-socket-convert > "${systemd_sockconf}"
+       fi
+       # copy out any mysqld_safe settings
+       systemd_conf=/etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
+       if [ -x /usr/bin/mariadb-service-convert  -a ! -f "${systemd_conf}" ]; then
+              mkdir -p /etc/systemd/system/mariadb.service.d
+              /usr/bin/mariadb-service-convert > "${systemd_conf}"
+       fi
+
 fi
 
 db_stop # in case invoke failes

debian/dist/Debian/rules

@@ -180,6 +180,9 @@ install: build
 	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_SRC
 	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_BIN
 
+	# systemd helpers
+	install -m 0755 support-files/mariadb-systemd-start $(TMP)/usr/bin/
+
 	# mariadb-test
 	mv $(TMP)/usr/mysql-test	$(TMP)/usr/share/mysql
 
@@ -216,7 +219,9 @@ binary-indep: build install
 	dh_installexamples -i
 	dh_installmenu -i
 	dh_installlogrotate -i
+	dh_systemd_enable -i support-files/mariadb.service support-files/mariadb.socket
 	dh_installinit -i
+	dh_systemd_start -i --restart-after-upgrade mariadb.socket
 	dh_installcron -i 
 	dh_installman -i
 	dh_installinfo -i

debian/dist/Ubuntu/control

@@ -9,7 +9,8 @@ Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6),
                zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV},
                libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath,
                dpatch, gawk, bison, lsb-release, hardening-wrapper,
-               ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
+               ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0),
+               libsystemd-daemon-dev, dh-systemd
 Standards-Version: 3.8.2
 Homepage: http://mariadb.org/
 Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
@@ -162,6 +163,7 @@ Description: MariaDB database client binaries
 Package: mariadb-server-core-10.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
+    libsystemd-daemon0
 Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
 Conflicts: mysql-server-5.0, mysql-server-core-5.0,
     mariadb-server-core-5.1, mysql-server-core-5.1,

debian/dist/Ubuntu/mariadb-server-10.0.files.in

@@ -45,6 +45,9 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
+usr/bin/mariadb-socket-convert
+usr/bin/mariadb-system-convert
+usr/bin/mariadb-systemd-start
 usr/share/doc/mariadb-server-10.0/mysqld.sym.gz
 usr/share/doc/mariadb-server-10.0/INFO_SRC
 usr/share/doc/mariadb-server-10.0/INFO_BIN

debian/dist/Ubuntu/mariadb-server-10.0.postinst

@@ -276,6 +276,18 @@ if [ "$1" = "configure" ]; then
                db_go
        fi
 
+       # create a systemd socket activation file based on current settings
+       systemd_sockconf=/etc/systemd/system/mariadb.socket.d/migrated-from-my.cnf-settings.conf
+       if [ -x /usr/bin/mariadb-socket-convert  -a ! -f "${systemd_sockconf}" ]; then
+               mkdir -p /etc/systemd/system/mariadb.socket.d
+               /usr/bin/mariadb-socket-convert > "${systemd_sockconf}"
+       fi
+       # copy out any mysqld_safe settings
+       systemd_conf=/etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
+       if [ -x /usr/bin/mariadb-service-convert  -a ! -f "${systemd_conf}" ]; then
+              mkdir -p /etc/systemd/system/mariadb.service.d
+              /usr/bin/mariadb-service-convert > "${systemd_conf}"
+       fi
 fi
 
 db_stop # in case invoke failes

debian/dist/Ubuntu/rules

@@ -180,6 +180,9 @@ install: build
 	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_SRC
 	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.0/INFO_BIN
 
+	# systemd helpers
+	install -m 0755 support-files/mariadb-systemd-start $(TMP)/usr/bin/
+
 	# mariadb-test
 	mv $(TMP)/usr/mysql-test	$(TMP)/usr/share/mysql
 
@@ -221,7 +224,9 @@ binary-indep: build install
 	dh_installexamples -i
 	dh_installmenu -i
 	dh_installlogrotate -i
+	dh_systemd_enable -i support-files/mariadb.service support-files/mariadb.socket
 	dh_installinit -i
+	dh_systemd_start -i --restart-after-upgrade mariadb.socket
 	dh_installcron -i 
 	dh_installman -i
 	dh_installinfo -i

include/my_sdnotify.h

@@ -0,0 +1,17 @@
+
+#ifndef _my_sdnotify_h
+#define _my_sdnotify_h
+
+#ifdef HAVE_SYSTEMD
+#include <systemd/sd-daemon.h>
+
+#else
+
+#define sd_listen_fds(X) 0
+
+#define sd_notify(X, Y, Z)
+static int sd_notifyf(int unset_environment, const char *format, ...) {}
+
+#endif
+
+#endif /* _my_sdnotify_h */

include/mysql/psi/mysql_socket.h

@@ -281,6 +281,22 @@ inline_mysql_socket_set_state(MYSQL_SOCKET socket, enum PSI_socket_state state)
 }
 #endif /* HAVE_PSI_SOCKET_INTERFACE */
 
+/**
+  @def mysql_socket_fd(K, F)
+  Create a socket.
+  @c mysql_socket_fd is a replacement for @c socket.
+  @param K PSI_socket_key for this instrumented socket
+  @param F File descriptor
+*/
+
+#ifdef HAVE_PSI_SOCKET_INTERFACE
+  #define mysql_socket_fd(K, F) \
+    inline_mysql_socket_fd(K, F)
+#else
+  #define mysql_socket_fd(K, F) \
+    inline_mysql_socket_fd(F)
+#endif
+
 /**
   @def mysql_socket_socket(K, D, T, P)
   Create a socket.
@@ -542,6 +558,28 @@ static inline void inline_mysql_socket_register(
 }
 #endif
 
+/** mysql_socket_fd */
+
+static inline MYSQL_SOCKET
+inline_mysql_socket_fd
+(
+#ifdef HAVE_PSI_SOCKET_INTERFACE
+  PSI_socket_key key,
+#endif
+  int fd)
+{
+  MYSQL_SOCKET mysql_socket= MYSQL_INVALID_SOCKET;
+  mysql_socket.fd= fd;
+#ifdef HAVE_PSI_SOCKET_INTERFACE
+  if (likely(mysql_socket.fd != INVALID_SOCKET))
+  {
+    mysql_socket.m_psi= PSI_SOCKET_CALL(init_socket)
+      (key, (const my_socket*)&mysql_socket.fd, NULL, 0);
+  }
+#endif
+  return mysql_socket;
+}
+
 /** mysql_socket_socket */
 
 static inline MYSQL_SOCKET

scripts/CMakeLists.txt

@@ -339,6 +339,8 @@ ELSE()
     mysqldumpslow
     mysqld_multi
     mysqld_safe
+    mariadb-service-convert
+    mariadb-socket-convert
   )
   FOREACH(file ${BIN_SCRIPTS})
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)

scripts/mariadb-service-convert

@@ -0,0 +1,63 @@
+#!/bin/bash
+#
+# Used to generate a mariadb.service file based on the curent mysql/maridb settings
+#
+# This is to assist distro maintainers in migrating to systemd service definations from
+# a user mysqld_safe settings in the my.cnf files.
+#
+# Redirect output to user directory like /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
+
+tz_old=$TZ
+
+. /usr/bin/mysqld_safe --simulate
+
+echo "# converted using $0"
+echo "#"
+echo
+
+echo '[Service]'
+
+echo
+
+
+if [[ ( "$user" != "root" && "$user" != "mysql" ) || "${SET_USER}" == 1 ]]; then
+  echo User=$user
+fi
+
+
+[ -n "${open_files}" ] && echo LimitNOFILE=$open_files
+[ -n "${core_file_size}" ] && echo LimitCore=$core_file_size
+[ "${niceness}" -gt 0 ] && echo Nice=$niceness
+[ "${TZ}" != "${tz_old}" ] && echo Environment=\"TZ=${TZ}\"
+
+if [ -n "$mysqld_ld_preload" ]; then
+  new_text="$mysqld_ld_preload"
+  [ -n "$LD_PRELOAD" ] && new_text="$new_text $LD_PRELOAD"
+  echo Environment=\"LD_PRELOAD=`shell_quote_string "$new_text"`\"
+fi
+
+if [ -n "$mysqld_ld_library_path" ]; then
+  new_text="$mysqld_ld_library_path"
+  [ -n "$LD_LIBRARY_PATH" ] && new_text="$new_text:$LD_LIBRARY_PATH"
+  echo Environment=\"LD_LIBRARY_PATH=`shell_quote_string "$new_text"`\"
+fi
+
+if [ $want_syslog -eq 1 ]; then
+  echo StandardError=syslog
+  echo SyslogFacility=daemon
+  echo SyslogLevel=error
+  echo SyslogLevelPrefix=${syslog_tag_mysqld}
+fi
+
+if [ "${flush_caches}" -gt 0  ]; then
+  echo ExecStartPre=sync
+  echo ExecStartPre=sysctl -q -w vm.drop_caches=3
+fi
+
+if [ "${numa_interleave}" -gt 0  ]; then
+  echo
+  echo ExecStart=numactl --interleave=all ${cmd} '${OPTIONS}'
+  echo
+fi
+
+[ -n "${CRASH_SCRIPT}" ] && echo FailureAction=${CRASH_SCRIPT}