From 2bc6be1e4f77245441950719757893ac28a984c7 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 20 Apr 2018 12:15:26 +1000 Subject: [PATCH] ctdb-scripts: Fetch database options from config file in scripts Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/config/debug_locks.sh | 8 ++------ ctdb/config/events.d/00.ctdb | 3 +++ ctdb/config/events.d/05.system | 3 +++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ctdb/config/debug_locks.sh b/ctdb/config/debug_locks.sh index db02f0cdbaa1..086768540880 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 8d376d2a95b8..8db4a19d1844 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 a902b22646ea..e2ffeac715a8 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 ;; -- 2.34.1