build: Move the default CTDB socket from /tmp to /var/run/ctdb

Use /var/run/ctdb/ctdbd.socket because there might be other daemons
that need sockets in the future.

The local daemons test code to create a link for the default
convenience socket has to be removed because the link can't be created
as a regular user in the new location.  This should be OK since all
calls to the ctdb tool in the test code should be wrapped in onnode.
When debugging tests, a developer will have to set CTDB_SOCKET by
hand.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Pair-programmed-with: Martin Schwenke <martin@meltin.net>

diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index 8233f27a96c9dc0b9ce55e195e4eb8d134ad3971..35bf5f8323458104384ddd983b20ca6be4d9f6c6 100644 (file)
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -108,8 +108,8 @@ CTDB_RECOVERY_LOCK="/some/place/on/shared/storage"
 # CTDB_EVENT_SCRIPT_DIR=/etc/ctdb/events.d
 
 # the location of the local ctdb socket
-# defaults to /tmp/ctdb.socket
-# CTDB_SOCKET=/tmp/ctdb.socket
+# defaults to /var/run/ctdb/ctdbd.socket
+# CTDB_SOCKET=/var/run/ctdb/ctdbd.socket
 
 # what transport to use. Only tcp is currently supported
 # defaults to tcp

diff --git a/configure.ac b/configure.ac
index f3d2033aa93c4ef8954117029eac7bfb472c0b7a..9621f42a658339db6c9ff9ee6cf9038b98d752af 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -72,9 +72,9 @@ if test ! -z "$LOGDIR"; then
 fi
 AC_SUBST(LOGDIR)
 
-SOCKPATH='/tmp/ctdb.socket'
+SOCKPATH='${localstatedir}/run/ctdb/ctdbd.socket'
 AC_ARG_WITH([socketpath],
-       [  --with-socketpath=FILE       path to CTDB daemon socket [[/tmp/ctdb.socket]]],
+       [  --with-socketpath=FILE       path to CTDB daemon socket [[LOCALSTATEDIR/run/ctdb/ctdbd.socket]]],
        SOCKPATH=$withval)
 if test ! -z "$SOCKPATH"; then
   if test "$SOCKPATH" = "yes" -o "$SOCKPATH" = "no"; then

diff --git a/include/ctdb_protocol.h b/include/ctdb_protocol.h
index 9c0d981c849f1c9bac4d0e376b034f122841fc05..15c87be6871c7da793d6717353ad01a9d997866b 100644 (file)
--- a/include/ctdb_protocol.h
+++ b/include/ctdb_protocol.h
@@ -24,7 +24,7 @@
 #ifdef SOCKPATH
 #define CTDB_PATH      SOCKPATH
 #else
-#define CTDB_PATH      "/tmp/ctdb.socket"
+#define CTDB_PATH      "/var/run/ctdb/ctdbd.socket"
 #endif
 
 /* default ctdb port number */

diff --git a/tests/scripts/integration.bash b/tests/scripts/integration.bash
index 59f37c919eafc7dc13f8e5e83420f44f9ea3134b..040a36048de110f4250c47722a20997ea8527389 100644 (file)
--- a/tests/scripts/integration.bash
+++ b/tests/scripts/integration.bash
@@ -608,10 +608,6 @@ daemons_start ()
     for i in $(seq 0 $(($TEST_LOCAL_DAEMONS - 1))) ; do
        daemons_start_1 $i "$@"
     done
-
-    if [ -L /tmp/ctdb.socket -o ! -S /tmp/ctdb.socket ] ; then 
-       ln -sf "${TEST_VAR_DIR}/sock.0" /tmp/ctdb.socket || return 1
-    fi
 }
 
 #######################################