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 db02f0cdbaa1433efbc48a56d80a5ee525e4d848..086768540880f6291a11c3b489b7fd9f6205e22b 100755 (executable)
--- 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 8d376d2a95b84b7afaa57eafae743adac36019d7..8db4a19d18444d1c4556863adc30e19e221329c5 100755 (executable)
--- 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 a902b22646ea0f6aa7b05c68e749e9eb16c28593..e2ffeac715a87d9fd01b1d597301232dfea354e3 100755 (executable)
--- 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
        ;;