From: Martin Schwenke <martin@meltin.net>
Date: Fri, 20 Apr 2018 02:15:26 +0000 (+1000)
Subject: ctdb-scripts: Fetch database options from config file in scripts
X-Git-Tag: ldb-1.4.0~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bc6be1e4f77245441950719757893ac28a984c7;p=thirdparty%2Fsamba.git

ctdb-scripts: Fetch database options from config file in scripts

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

diff --git a/ctdb/config/debug_locks.sh b/ctdb/config/debug_locks.sh
index db02f0cdbaa..08676854088 100755
--- a/ctdb/config/debug_locks.sh
+++ b/ctdb/config/debug_locks.sh
@@ -12,12 +12,8 @@
 
 . "${CTDB_BASE}/functions"
 
-# Default fallback location for database directories.
-# These can be overwritten from CTDB configuration
-CTDB_DBDIR="${CTDB_VARDIR}/volatile"
-CTDB_DBDIR_PERSISTENT="${CTDB_VARDIR}/persistent"
-
-load_script_options
+# Load/cache database options from configuration file
+ctdb_get_db_options
 
 (
     flock -n 9 || exit 1
diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events.d/00.ctdb
index 8d376d2a95b..8db4a19d184 100755
--- a/ctdb/config/events.d/00.ctdb
+++ b/ctdb/config/events.d/00.ctdb
@@ -133,6 +133,9 @@ init)
 	mkdir -p "$CTDB_SCRIPT_VARDIR" || \
 	    die "mkdir -p ${CTDB_SCRIPT_VARDIR} - failed - $?" $?
 
+	# Load/cache database options from configuration file
+	ctdb_get_db_options
+
 	if select_tdb_checker ; then
 	    check_persistent_databases || exit $?
 	    check_non_persistent_databases
diff --git a/ctdb/config/events.d/05.system b/ctdb/config/events.d/05.system
index a902b22646e..e2ffeac715a 100755
--- a/ctdb/config/events.d/05.system
+++ b/ctdb/config/events.d/05.system
@@ -169,6 +169,9 @@ END {
 
 case "$1" in
 monitor)
+	# Load/cache database options from configuration file
+	ctdb_get_db_options
+
 	monitor_filesystem_usage
 	monitor_memory_usage
 	;;