[SCM] Samba Shared Repository - branch master updated
Amitay Isaacs
amitay at samba.org
Wed Oct 28 08:45:03 UTC 2015
The branch, master has been updated
via 86111fc ctdb-scripts: Fix an incorrect comment
via b9903d7 ctdb-scripts: Remove PID file only if it existed
from 0a90ed5 ctdb: open the RO tracking db with perms 0600 instead of 0000
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 86111fcdce48dc25c46177b63ca12f55afee5f04
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Oct 21 14:18:22 2015 +1100
ctdb-scripts: Fix an incorrect comment
Since commit 84f5528d9b526b1e9cb02c245e816c0c5e54c3bc, CTDB will not
remove an existing socket if it can connect to the existing one.
Instead it will fail to start.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
Autobuild-Date(master): Wed Oct 28 09:44:37 CET 2015 on sn-devel-104
commit b9903d72d3d53376ddca7e2f2f902195307b395c
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Oct 21 14:12:40 2015 +1100
ctdb-scripts: Remove PID file only if it existed
If 2 attempts are made to start CTDB in quick succession then it is
possible for the 2nd attempt to remove a newly created PID file from
the 1st.
If the PID file existed then the PID/SID from ctdbd_is_running() will
be passed to kill_ctdbd(). If the PID file did not exist then there
is no point removing it.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/ctdbd_wrapper | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index 66d88c9..c98c190 100755
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -148,8 +148,8 @@ kill_ctdbd ()
if [ -n "$_session" ] ; then
pkill -9 -s "$_session" 2>/dev/null
+ rm -f "$pidfile"
fi
- rm -f "$pidfile"
}
############################################################
@@ -163,9 +163,6 @@ start()
# About to start new $ctdbd. The main daemon is not running but
# there may still be other processes around, so do some cleanup.
- # Note that starting ctdbd below will destroy the Unix domain
- # socket, so any processes that aren't yet completely useless soon
- # will be, so this can really do no harm.
kill_ctdbd "$_session"
build_ctdb_options
--
Samba Shared Repository
More information about the samba-cvs
mailing list