ctdb-scripts: Split CTDB configuration loading
authorMartin Schwenke <martin@meltin.net>
Tue, 6 Feb 2018 00:25:56 +0000 (11:25 +1100)
committerAmitay Isaacs <amitay@samba.org>
Wed, 28 Mar 2018 00:57:20 +0000 (02:57 +0200)
commitb49977552741a739ae2bc2d6c0b3b5d4c36ee084
treefac83ffb9e80b1dc3a320646af3a1d82fb44ee77
parent8b18221529e242120ced0cee6592fb733950f1f5
ctdb-scripts: Split CTDB configuration loading

loadconfig() currently tries to load the CTDB configuration and also
any system configuration relevant to the current (event) script.

Instead add a new function load_system_config() to load the
distribution-specific system configuration for a component.  Call this
directly in the rare scripts that need the system configuration.

Also call load_system_config when loading the CTDB configuration to
pull in anything from the CTDB system configuration.  This is partly
for backward compatibility but also to get options that can be used
anywhere.

loadconfig() no longer takes an argument.  It simply loads the CTDB
configuration.

Drop support for falling back to /etc/ctdb/sysconfig/ctdb (or
similar).  Surely there's nobody who uses that!

Also, drop the indirection where loadconfig() calls _loadconfig().
This was used years ago as a test hook and is no longer required.

Inexplicably, this change introduces a new shellcheck test failure, so
silence this.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
13 files changed:
ctdb/config/ctdb-crash-cleanup.sh
ctdb/config/ctdb.init
ctdb/config/ctdbd_wrapper
ctdb/config/debug-hung-script.sh
ctdb/config/debug_locks.sh
ctdb/config/events.d/60.nfs
ctdb/config/events.d/91.lvs
ctdb/config/events.d/99.timeout
ctdb/config/functions
ctdb/config/statd-callout
ctdb/tools/ctdb_lvs
ctdb/tools/ctdb_natgw
ctdb/tools/onnode