From: Martin Schwenke <martin@meltin.net>
Date: Sat, 14 Apr 2018 11:38:32 +0000 (+1000)
Subject: ctdb-scripts: Drop warning when there is no recovery lock
X-Git-Tag: ldb-1.4.0~478
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8821857cdfa775eee27f9bb5c7ea270c334880f8;p=thirdparty%2Fsamba.git

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 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"