saving uncommitted changes in /etc prior to emerge run

diff --git a/init.d/mysql b/init.d/mysql
index ac94a9dd39b3c34a457fa01caee91b18ac8cc96a..f6ad52496e4e12798f1d03edc07de8c0dca72a26 100755 (executable)
--- a/init.d/mysql
+++ b/init.d/mysql
@@ -1,8 +1,12 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="checkconfig"
+extra_stopped_commands="bootstrap_galera"
+
+description_checkconfig="Verify the server's configuration"
+description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
 
 depend() {
        use net.lo
@@ -11,7 +15,7 @@ depend() {
 }
 
 get_config() {
-       my_print_defaults --config-file="$1" mysqld |
+       my_print_defaults --defaults-file="$1" mysqld server mariadb |
        sed -n -e "s/^--$2=//p"
 }
 
@@ -24,6 +28,20 @@ mysql_svcname() {
        echo "${SVCNAME}${ebextra}"
 }
 
+stringContain() { [ -z "${2##*$1*}" ] && [ -z "$1" -o -n "$2" ]; }
+
+bootstrap_galera() {
+       MY_ARGS="--wsrep-new-cluster ${MY_ARGS}"
+       mark_service_starting
+       if start ; then
+               mark_service_started
+               return 0
+       else
+               mark_service_stopped
+               return 1
+       fi
+}
+
 start() {
        # Check for old conf.d variables that mean migration was not yet done.
        set | egrep -sq '^(mysql_slot_|MYSQL_BLOG_PID_FILE|STOPTIMEOUT)'
@@ -38,7 +56,9 @@ start() {
        fi
 
        # Check the config or die
-       checkconfig || return 1
+       if [ ${RC_CMD} != "restart" ] ; then
+               checkconfig || return 1
+       fi
 
        # Now we can startup
        ebegin "Starting $(mysql_svcname)"
@@ -52,33 +72,41 @@ start() {
 
        # tail -n1 is critical as these we only want the last instance of the option
        local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
-       local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
        local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
        local socket=$(get_config "${MY_CNF}" socket | tail -n1)
        local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
+       local wsrep="$(get_config "${MY_CNF}" 'wsrep[_-]on' | tail -n1 | awk '{print tolower($0)}')"
+       local wsrep_new=$(get_config "${MY_CNF}" 'wsrep-new-cluster' | tail -n1)
 
        if [ -n "${chroot}" ] ; then
                socket="${chroot}/${socket}"
                pidfile="${chroot}/${pidfile}"
        fi
 
-       if [ ! -d "${datadir}" ] ; then
-               eerror "MySQL datadir \`${datadir}' is empty or invalid"
-               eerror "Please check your config file \`${MY_CNF}'"
-               return 1
-       fi
+       # Galera: Only check datadir if not starting a new cluster and galera is enabled
+       # wsrep_on is not on or wsrep-new-cluster exists in the config or MY_ARGS
+       [ "${wsrep}" = "1" ] && wsrep="on"
+       if [ "${wsrep}" != "on" ] || [ -n "${wsrep_new}" ] || stringContain 'wsrep-new-cluster' "${MY_ARGS}" ; then
 
-       if [ ! -d "${datadir}"/mysql ] ; then
-               # find which package is installed to report an error
-               local EROOT=$(portageq envvar EROOT)
-               local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
-               if [ -z ${DBPKG_P} ] ; then
-                       eerror "You don't appear to have a server package installed yet."
-               else
-                       eerror "You don't appear to have the mysql database installed yet."
-                       eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
+               local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
+               if [ ! -d "${datadir}" ] ; then
+                       eerror "MySQL datadir \`${datadir}' is empty or invalid"
+                       eerror "Please check your config file \`${MY_CNF}'"
+                       return 1
+               fi
+
+               if [ ! -d "${datadir}"/mysql ] ; then
+                       # find which package is installed to report an error
+                       local EROOT=$(portageq envvar EROOT)
+                       local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
+                       if [ -z ${DBPKG_P} ] ; then
+                               eerror "You don't appear to have a server package installed yet."
+                       else
+                               eerror "You don't appear to have the mysql database installed yet."
+                               eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
+                       fi
+                       return 1
                fi
-               return 1
        fi
 
        local piddir="${pidfile%/*}"
@@ -117,6 +145,10 @@ start() {
 }
 
 stop() {
+       if [ ${RC_CMD} = "restart" ] ; then
+               checkconfig || return 1
+       fi
+
        ebegin "Stopping $(mysql_svcname)"
 
        local pidfile="$(get_options pidfile)"

diff --git a/init.d/mysql-s6 b/init.d/mysql-s6
index 74ff34b04fcf32197a8123bc62f72fbcc6e408d3..3fa54e949c91058f58faea0e86309c56b75ab996 100755 (executable)
--- a/init.d/mysql-s6
+++ b/init.d/mysql-s6
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -9,7 +9,7 @@ depend() {
 }
 
 get_config() {
-       my_print_defaults --config-file="$1" mysqld |
+       my_print_defaults --defaults-file="$1" mysqld server mariadb |
        sed -n -e "s/^--$2=//p"
 }
 
@@ -22,7 +22,26 @@ mysql_svcname() {
        echo "${svc_name}${ebextra}"
 }
 
+stringContain() { [ -z "${2##*$1*}" ] && [ -z "$1" -o -n "$2" ]; }
+
+bootstrap_galera() {
+       MY_ARGS="--wsrep-new-cluster ${MY_ARGS}"
+       mark_service_starting
+       if start_pre && start ; then
+               mark_service_started
+               return 0
+       else
+               mark_service_stopped
+               return 1
+       fi
+}
+
+
 extra_commands="checkconfig"
+extra_stopped_commands="bootstrap_galera"
+
+description_checkconfig="Verify the server's configuration"
+description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
 supervisor=s6
 name=$(mysql_svcname)
 s6_service_timeout_stop="$((1000*${STOP_TIMEOUT:-120}))"
@@ -32,7 +51,9 @@ s6_service_path=/var/svc.d/${svc_name}
 
 start_pre() {
        # Check the config or die
-       checkconfig || return 1
+       if [ ${RC_CMD} != "restart" ] ; then
+               checkconfig || return 1
+       fi
 
        MY_CNF="${MY_CNF:-/etc/${svc_name}/my.cnf}"
 
@@ -43,33 +64,41 @@ start_pre() {
 
        # tail -n1 is critical as these we only want the last instance of the option
        local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
-       local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
        local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
        local socket=$(get_config "${MY_CNF}" socket | tail -n1)
        local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
+       local wsrep="$(get_config "${MY_CNF}" 'wsrep[_-]on' | tail -n1 | awk '{print tolower($0)}')"
+       local wsrep_new=$(get_config "${MY_CNF}" 'wsrep-new-cluster' | tail -n1)
 
        if [ -n "${chroot}" ] ; then
                socket="${chroot}/${socket}"
                pidfile="${chroot}/${pidfile}"
        fi
 
-       if [ ! -d "${datadir}" ] ; then
-               eerror "MySQL datadir \`${datadir}' is empty or invalid"
-               eerror "Please check your config file \`${MY_CNF}'"
-               return 1
-       fi
+       # Galera: Only check datadir if not starting a new cluster and galera is enabled
+       # wsrep_on is not on or wsrep-new-cluster exists in the config or MY_ARGS
+       [ "${wsrep}" = "1" ] && wsrep="on"
+       if [ "${wsrep}" != "on" ] || [ -n "${wsrep_new}" ] || stringContain 'wsrep-new-cluster' "${MY_ARGS}" ; then
 
-       if [ ! -d "${datadir}"/mysql ] ; then
-               # find which package is installed to report an error
-               local EROOT=$(portageq envvar EROOT)
-               local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
-               if [ -z ${DBPKG_P} ] ; then
-                       eerror "You don't appear to have a server package installed yet."
-               else
-                       eerror "You don't appear to have the mysql database installed yet."
-                       eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
+               local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
+               if [ ! -d "${datadir}" ] ; then
+                       eerror "MySQL datadir \`${datadir}' is empty or invalid"
+                       eerror "Please check your config file \`${MY_CNF}'"
+                       return 1
+               fi
+
+               if [ ! -d "${datadir}"/mysql ] ; then
+                       # find which package is installed to report an error
+                       local EROOT=$(portageq envvar EROOT)
+                       local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
+                       if [ -z ${DBPKG_P} ] ; then
+                               eerror "You don't appear to have a server package installed yet."
+                       else
+                               eerror "You don't appear to have the mysql database installed yet."
+                               eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
+                       fi
+                       return 1
                fi
-               return 1
        fi
 
        local piddir="${pidfile%/*}"
@@ -124,5 +153,11 @@ checkconfig() {
        eend $? "${svc_name} config check failed"
 }
 
+stop_pre() {
+       if [ ${RC_CMD} = "restart" ] ; then
+               checkconfig || return 1
+       fi
+}
+
 # vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
 

diff --git a/init.d/mysql-supervise b/init.d/mysql-supervise
new file mode 100755 (executable)
index 0000000..5341a6a
--- /dev/null
+++ b/init.d/mysql-supervise
@@ -0,0 +1,180 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_stopped_commands="boostrap_galera"
+
+description_checkconfig="Verify the server's configuration"
+description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
+
+depend() {
+       use net.lo
+       # localmount needed for $basedir
+       need localmount
+}
+
+get_config() {
+       my_print_defaults --defaults-file="$1" mysqld server mariadb |
+       sed -n -e "s/^--$2=//p"
+}
+
+mysql_svcname() {
+       local ebextra=
+       case "${SVCNAME}" in
+               mysql*) ;;
+               *) ebextra=" (mysql)" ;;
+       esac
+       echo "${SVCNAME}${ebextra}"
+}
+
+stringContain() { [ -z "${2##*$1*}" ] && [ -z "$1" -o -n "$2" ]; }
+
+bootstrap_galera() {
+       MY_ARGS="--wsrep-new-cluster ${MY_ARGS}"
+       mark_service_starting
+       if start ; then
+               mark_service_started
+               return 0
+       else
+               mark_service_stopped
+               return 1
+       fi
+}
+
+start() {
+       # Check for old conf.d variables that mean migration was not yet done.
+       set | egrep -sq '^(mysql_slot_|MYSQL_BLOG_PID_FILE|STOPTIMEOUT)'
+       rc=$?
+       # Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable.
+       # It does have a use in testing, as it is possible to build a config file
+       # that works with both the old and new init scripts simulateously.
+       if [ "${rc}" = 0 -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
+               eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp."
+               eerror "Not proceeding because it may be dangerous."
+               return 1
+       fi
+
+       # Check the config or die
+       if [ ${RC_CMD} != "restart" ] ; then
+               checkconfig || return 1
+       fi
+
+       # Now we can startup
+       ebegin "Starting $(mysql_svcname)"
+
+       MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+
+       if [ ! -r "${MY_CNF}" ] ; then
+               eerror "Cannot read the configuration file \`${MY_CNF}'"
+               return 1
+       fi
+
+       # tail -n1 is critical as these we only want the last instance of the option
+       local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
+       local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
+       local socket=$(get_config "${MY_CNF}" socket | tail -n1)
+       local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
+       local wsrep="$(get_config "${MY_CNF}" 'wsrep[_-]on' | tail -n1 | awk '{print tolower($0)}')"
+       local wsrep_new=$(get_config "${MY_CNF}" 'wsrep-new-cluster' | tail -n1)
+
+       if [ -n "${chroot}" ] ; then
+               socket="${chroot}/${socket}"
+               pidfile="${chroot}/${pidfile}"
+       fi
+
+       # Galera: Only check datadir if not starting a new cluster and galera is enabled
+       # wsrep_on is not on or wsrep-new-cluster exists in the config or MY_ARGS
+       [ "${wsrep}" = "1" ] && wsrep="on"
+       if [ "${wsrep}" != "on" ] || [ -n "${wsrep_new}" ] || stringContain 'wsrep-new-cluster' "${MY_ARGS}" ; then
+
+               local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
+               if [ ! -d "${datadir}" ] ; then
+                       eerror "MySQL datadir \`${datadir}' is empty or invalid"
+                       eerror "Please check your config file \`${MY_CNF}'"
+                       return 1
+               fi
+
+               if [ ! -d "${datadir}"/mysql ] ; then
+                       # find which package is installed to report an error
+                       local EROOT=$(portageq envvar EROOT)
+                       local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
+                       if [ -z ${DBPKG_P} ] ; then
+                               eerror "You don't appear to have a server package installed yet."
+                       else
+                               eerror "You don't appear to have the mysql database installed yet."
+                               eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
+                       fi
+                       return 1
+               fi
+       fi
+
+       local piddir="${pidfile%/*}"
+       checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
+       rc=$?
+       if [ $rc -ne 0 ]; then
+               eerror "Directory $piddir for pidfile does not exist and cannot be created"
+               return 1
+       fi
+
+       local startup_timeout=${STARTUP_TIMEOUT:-900}
+#      local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
+       local tmpnice="${NICE:+"--nicelevel "}${NICE}"
+       local tmpionice="${IONICE:+"--ionice "}${IONICE}"
+       supervise-daemon \
+               ${DEBUG:+"--verbose"} \
+               --pidfile "/run/${SVCNAME}.pid" \
+               ${tmpnice} \
+               ${tmpionice} \
+               --start \
+               "${basedir}"/sbin/mysqld \
+               -- --defaults-file="${MY_CNF}" ${MY_ARGS}
+       local ret=$?
+       if [ ${ret} -ne 0 ] ; then
+               eend ${ret}
+               return ${ret}
+       fi
+
+       ewaitfile ${startup_timeout} "${socket}"
+       eend $? || return 1
+}
+
+stop() {
+       if [ ${RC_CMD} = "restart" ] ; then
+               checkconfig || return 1
+       fi
+
+       ebegin "Stopping $(mysql_svcname)"
+
+       supervise-daemon \
+               ${DEBUG:+"--verbose"} \
+               --stop \
+               --pidfile "/run/${SVCNAME}.pid"
+       eend $?
+}
+
+checkconfig() {
+       local my_cnf="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+       local basedir=$(get_config "${my_cnf}" basedir | tail -n1)
+       local svc_name=$(mysql_svcname)
+       ebegin "Checking mysqld configuration for ${svc_name}"
+
+       if [ ${RC_CMD} = "checkconfig" ] ; then
+               # We are calling checkconfig specifically.  Print warnings regardless.
+               "${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+       else
+               # Suppress output to check the return value
+               "${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null 2>&1
+
+               # If the above command does not return 0,
+               # then there is an error to echo to the user
+               if [ $? -ne 0 ] ; then
+                       "${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+               fi
+       fi
+
+       eend $? "${svc_name} config check failed"
+}
+
+# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
+