Ganeti uses an internal tool to start/stop daemons during init and upgrade. This patch makes the tool use native Shepherd facilities. diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in --- a/daemons/daemon-util.in +++ b/daemons/daemon-util.in @@ -184,6 +184,21 @@ use_systemctl() { return 1 } +# Checks if we should use the Shepherd to start/stop daemons +use_shepherd() { + # Is Shepherd running as PID 1? + ps --no-headers -p 1 -o cmd | grep -q shepherd || return 1 + + type -p herd >/dev/null || return 1 + + # Does Shepherd know about Ganeti at all? + if herd status | grep -q ganeti; then + return 0 + fi + + return 1 +} + # Prints path to PID file for a daemon. daemon_pidfile() { if [[ "$#" -lt 1 ]]; then @@ -261,6 +276,13 @@ check() { else return 1 fi + elif use_shepherd; then + activestate="$(herd status ${name})" + if echo $activestate | grep -q Running ; then + return 0 + else + return 1 + fi elif type -p start-stop-daemon >/dev/null; then start-stop-daemon --stop --signal 0 --quiet \ --pidfile $pidfile --name "$name" @@ -291,6 +313,20 @@ start() { return $? fi + if use_shepherd; then + if herd status "$name" | grep -q "disabled"; then + # The Shepherd will disable a service that has stopped, even if it exits + # gracefully. Thus, we must re-enable it in case of a master failover. + herd enable "${name}" + fi + # Note: unlike systemd, which happily starts a service and returns success + # even if the daemon immediately exits, the Shepherd actually waits for it + # to come up. Thus, ignore the exit status from 'herd start' in case of + # master daemons running on the wrong node, or ganeti-kvmd disabled, etc. + herd start "${name}" + return 0 + fi + # Read $_ARGS and $EXTRA__ARGS eval local args="\"\$${ucname}_ARGS \$EXTRA_${ucname}_ARGS\"" @@ -336,6 +372,13 @@ stop() { if use_systemctl; then systemctl stop "${name}.service" + elif use_shepherd; then + if herd status | grep -q "$name"; then + herd stop "$name" + else + # Do not raise an error if the service has not been enabled. + return 0 + fi elif type -p start-stop-daemon >/dev/null; then start-stop-daemon --stop --quiet --oknodo --retry 30 \ --pidfile $pidfile --name "$name" @@ -352,6 +395,9 @@ check_and_start() { if use_systemctl; then echo "${name} supervised by systemd but not running, will not restart." return 1 + elif use_shepherd; then + echo "${name} supervised by shepherd but not running, will not restart." + return 1 fi start $name 0-05-26gnu: pcre2: Update to 10.35....* gnu/packages/pcre.scm (pcre2): Update to 10.35. Marius Bakke 2020-03-14gnu: pcre: Update to 8.44....* gnu/packages/pcre.scm (pcre): Update to 8.44. Marius Bakke 2019-12-11gnu: pcre2: Do not build static libraries....* gnu/packages/pcre.scm (pcre2)[arguments]: Add "--disable-static" to #:configure-flags. Marius Bakke 2019-12-11gnu: pcre2: Update to 10.34....* gnu/packages/patches/pcre2-fix-jit_match-crash.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/pcre.scm (pcre2): Update to 10.34. [source](patches): Remove. Marius Bakke 2019-08-13Merge branch 'master' into core-updatesMarius Bakke 2019-08-04gnu: Remove pcre2/fixed....* gnu/packages/pcre.scm (pcre2/fixed): Remove variable. (pcre2)[replacement]: Remove. [source](patches): New field. * gnu/packages/php.scm (php)[inputs]: Change PCRE2/FIXED to PCRE2. Marius Bakke 2019-08-02gnu: pcre@2: Fix run-time crash [security fix]....* gnu/packages/pcre.scm (pcre2)[replacement]: New field. (pcre2/fixed): New public variable. * packages/patches/pcre2-fix-jit_match-crash.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Tobias Geerinckx-Rice 2019-05-25Merge branch 'staging' into core-updatesMarius Bakke 2019-05-04gnu: pcre2: Update to 10.33....* gnu/packages/pcre.scm (pcre2): Update to 10.33. Marius Bakke