From 208996134632cfa99654238a089849fc19ddca52 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Tue, 6 Feb 2018 11:42:26 +1100 Subject: [PATCH] ctdb-scripts: Move script state to its own directory Don't use the same directory as temporary databases. Make associated test consistent. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/config/functions | 2 +- ctdb/tests/eventscripts/scripts/local.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ctdb/config/functions b/ctdb/config/functions index 68149c6399e..de8c2d07a3f 100755 --- a/ctdb/config/functions +++ b/ctdb/config/functions @@ -18,7 +18,7 @@ CTDB="${CTDB:-/usr/local/bin/ctdb}" # Only (and always) override these variables in test code if [ -z "$CTDB_SCRIPT_VARDIR" ] ; then - CTDB_SCRIPT_VARDIR="/usr/local/var/lib/ctdb/state" + CTDB_SCRIPT_VARDIR="/usr/local/var/lib/ctdb/scripts" fi if [ -z "$CTDB_SYS_ETCDIR" ] ; then diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index 4af1522e542..841d7288b99 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -27,7 +27,7 @@ if [ -d "$EVENTSCRIPTS_TESTS_VAR_DIR" -a \ rm -r "$EVENTSCRIPTS_TESTS_VAR_DIR" fi mkdir -p "$EVENTSCRIPTS_TESTS_VAR_DIR" -export CTDB_SCRIPT_VARDIR="$EVENTSCRIPTS_TESTS_VAR_DIR/script-state" +export CTDB_SCRIPT_VARDIR="$EVENTSCRIPTS_TESTS_VAR_DIR/scripts" export CTDB_LOGGING="file:${EVENTSCRIPTS_TESTS_VAR_DIR}/log.ctdb" touch "${CTDB_LOGGING#file:}" || \ -- 2.34.1