Skip to content

Commit

Permalink
ctdb-scripts: ctdbd_wrapper should never remove the PID file
Browse files Browse the repository at this point in the history
kill_ctdbd() kills the daemon and then removes the PID file.  This is
racy because a new daemon could write a new PID file in between the
kill and the removal.  Reversing these steps would be an improvement.

However, none of the places where kill_ctdbd() is called is a safe
place to remove the PID file.  There is always a chance that a new
daemon could start, write a new PID file and then kill_ctdbd() could
remove the new PID file.

ctdbd is able to overwrite a stale PID file by checking to see if it
is locked.

Therefore, entirely drop removal of the PID file from ctdbd_wrapper.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12287

Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
  • Loading branch information
martin-schwenke authored and vlendec committed Oct 13, 2016
1 parent d7214a8 commit 56d526c
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion ctdb/config/ctdbd_wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ kill_ctdbd ()

if [ -n "$_session" ] ; then
pkill -9 -s "$_session" 2>/dev/null
rm -f "$pidfile"
fi
}

Expand Down

0 comments on commit 56d526c

Please sign in to comment.