diff options
| author | Martin Schwenke <martin@meltin.net> | 2015-02-14 12:53:08 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-02-18 08:03:33 +0100 |
| commit | dc32f11b871a7d4e8ea6fd1d01491d89103decf7 (patch) | |
| tree | dd39e0238a69ffa137105e236c4f7285b300ebc8 /ctdb | |
| parent | c3706e7fb07bcb35f7d894c4e8e0c12b4a62d0db (diff) | |
| download | samba-dc32f11b871a7d4e8ea6fd1d01491d89103decf7.tar.gz samba-dc32f11b871a7d4e8ea6fd1d01491d89103decf7.tar.xz samba-dc32f11b871a7d4e8ea6fd1d01491d89103decf7.zip | |
ctdb-scripts: Improve messages about invalid tunables during "setup"
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Wed Feb 18 08:03:33 CET 2015 on sn-devel-104
Diffstat (limited to 'ctdb')
| -rwxr-xr-x | ctdb/config/events.d/00.ctdb | 14 | ||||
| -rwxr-xr-x | ctdb/tests/eventscripts/00.ctdb.setup.003.sh | 3 |
2 files changed, 12 insertions, 5 deletions
diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events.d/00.ctdb index c3754ae4a9..ec181757cf 100755 --- a/ctdb/config/events.d/00.ctdb +++ b/ctdb/config/events.d/00.ctdb @@ -119,14 +119,19 @@ update_config_from_tdb() { fi } -set_ctdb_variables () { +set_ctdb_variables () +{ # set any tunables from the config file set | sed -n '/^CTDB_SET_/s/=.*//p' | while read v; do varname="${v#CTDB_SET_}" value=$(eval echo "\$$v") - ctdb setvar $varname $value || return 1 - echo "Set $varname to $value" + if ctdb setvar $varname $value ; then + echo "Set $varname to $value" + else + echo "Invalid configuration: CTDB_SET_${varname}=${value}" + return 1 + fi done } @@ -198,7 +203,8 @@ case "$1" in setup) # Set any tunables from the config file - set_ctdb_variables || die "Failed to set CTDB tunables" + set_ctdb_variables || \ + die "Aborting setup due to invalid configuration - fix typos, remove unknown tunables" ;; startup) diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.003.sh b/ctdb/tests/eventscripts/00.ctdb.setup.003.sh index 46bbc990f9..4ce704051f 100755 --- a/ctdb/tests/eventscripts/00.ctdb.setup.003.sh +++ b/ctdb/tests/eventscripts/00.ctdb.setup.003.sh @@ -14,7 +14,8 @@ EOF required_result 1 <<EOF Set MonitorInterval to 5 Unable to set tunable variable 'UnknownMagic' -Failed to set CTDB tunables +Invalid configuration: CTDB_SET_UnknownMagic=0 +Aborting setup due to invalid configuration - fix typos, remove unknown tunables EOF simple_test |