sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

ctdb-scripts: Don't bother checking PID file when starting ctdbd

Browse Source 
This is an optimisation that can cause incorrect results.  If ctdbd
was killed and there is a stale PID file then this will often cause
"CTDB exited during initialisation".  The wrapper reads the old PID
from the PID file, finds the PID gone, complains and exits.

It is better to drop this code and finally get this right.  If ctdbd
does exit early then it will take CTDB_STARTUP_TIMEOUT (default 10)
seconds before the wrapper fails.  That's not too bad...

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2017-10-23 11:50:51 +11:00 committed by Amitay Isaacs
parent f025f5c0a7
commit 4b652c1527
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ctdb/config/ctdbd_wrapper
View File

@ -227,22 +227,8 @@ start()
_timeout="${CTDB_STARTUP_TIMEOUT:-10}"
_count=0
while [ "$_count" -lt "$_timeout" ] ; do
# If we don't have the PID then try to read it.
[ -n "$_pid" ] || read _pid 2>/dev/null <"$pidfile"
# If we got the PID but the PID file has gone or the process
# is no longer running then stop waiting... CTDB is dead.
if [ -n "$_pid" ] ; then
if [ ! -e "$pidfile" ] || ! kill -0 "$_pid" 2>/dev/null ; then
echo "CTDB exited during initialisation - check logs."
kill_ctdbd "$_pid"
drop_all_public_ips >/dev/null 2>&1
return 1
fi
if $CTDB runstate first_recovery startup running >/dev/null 2>&1 ; then
return 0
fi
if $CTDB runstate first_recovery startup running >/dev/null 2>&1 ; then
return 0
fi
_count=$((_count + 1))