diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-04-14 21:38:32 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2018-05-01 13:31:19 +0200 |
| commit | 8821857cdfa775eee27f9bb5c7ea270c334880f8 (patch) | |
| tree | fcfc75c8124833a9745e5b1eb813a68631319afb /ctdb/config | |
| parent | 79c49f60a98dfc390b7ef6a4195833237532507d (diff) | |
| download | samba-8821857cdfa775eee27f9bb5c7ea270c334880f8.tar.gz | |
ctdb-scripts: Drop warning when there is no recovery lock
After configuration changes ctdbd_wrapper will no longer see the
CTDB_RECOVERY_LOCK option. The daemon already logs a warning if the
recovery lock is not set, so simply drop this extra warning.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/config')
| -rwxr-xr-x | ctdb/config/ctdbd_wrapper | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper index f831afacb18..bcaf39850cf 100755 --- a/ctdb/config/ctdbd_wrapper +++ b/ctdb/config/ctdbd_wrapper @@ -87,12 +87,8 @@ build_ctdb_options () ctdb_options="${ctdb_options}${ctdb_options:+ }${1}${sep}${val}" } - if [ -z "$CTDB_RECOVERY_LOCK" ] ; then - echo "No recovery lock specified. Starting CTDB without split brain prevention." - fi - maybe_set "--reclock" "$CTDB_RECOVERY_LOCK" - # build up ctdb_options variable from optional parameters + maybe_set "--reclock" "$CTDB_RECOVERY_LOCK" maybe_set "--logging" "$CTDB_LOGGING" maybe_set "--listen" "$CTDB_NODE_ADDRESS" maybe_set "--dbdir" "$CTDB_DBDIR" |