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>

diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index f831afacb1886dac715eb4ae62bc893e1d715576..bcaf39850cf08a87bfd626da94d1769832692d1f 100755 (executable)
--- 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"