ctdb-config: Change example recovery lock setting to one that fails

ctdbd will start without a recovery lock configured.  It will log a
message saying that this is not optimal.  However, a careless user may
overlook both this message and the importance of setting a recovery
lock.  If the existing example configuration is uncommented then the
directory containing it will be created (by 01.reclock.script) and the
failure (i.e. multiple nodes able to take the lock) will be confusing.

Instead, change the example setting to one that will result in banned
nodes, encouraging users to consciously configure (or deconfigure) the
recovery lock.  Tweak the corresponding comment.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13790

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/config/ctdb.conf b/ctdb/config/ctdb.conf
index a9e6f693405125474c15fa8fc6d7f1c78b70acfc..5440600a43578d3dbd15f31b8ba879b5d5727928 100644 (file)
--- a/ctdb/config/ctdb.conf
+++ b/ctdb/config/ctdb.conf
@@ -11,7 +11,12 @@
        # log level = NOTICE
 
 [cluster]
        # log level = NOTICE
 
 [cluster]

-       # Shared recovery lock file to avoid split brain.  No default.
-       # Do NOT run CTDB without a recovery lock file unless you know exactly
-       # what you are doing.
-       # recovery lock = /shared/recovery.lock
+       # Shared recovery lock file to avoid split brain.  Daemon
+       # default is no recovery lock.  Do NOT run CTDB without a
+       # recovery lock file unless you know exactly what you are
+       # doing.
+       #
+       # Please see the RECOVERY LOCK section in ctdb(7) for more
+       # details.
+       #
+       # recovery lock = !/bin/false RECOVERY LOCK NOT CONFIGURED