ctdb-tests: Add -R option for local daemons to use recovery lock command

Under the covers, a command is always used.  However, there is no way
of testing of the code path where a command is explicitly configured.

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

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

diff --git a/ctdb/tests/local_daemons.sh b/ctdb/tests/local_daemons.sh
index 9329a60643c78a0f02eaf1b79f32293f670c80dc..07cf1e9b135c852c95c95b9ee3c496a6a96fa5e4 100755 (executable)
--- a/ctdb/tests/local_daemons.sh
+++ b/ctdb/tests/local_daemons.sh
@@ -132,6 +132,7 @@ Options:
   -N <file>     Nodes file (default: automatically generated)
   -n <num>      Number of nodes (default: 3)
   -P <file>     Public addresses file (default: automatically generated)
+  -R            Use a command for the recovery lock (default: use a file)
   -S <library>  Socket wrapper shared library to preload (default: none)
   -6            Generate IPv6 IPs for nodes, public addresses (default: IPv4)
 EOF
@@ -145,17 +146,19 @@ local_daemons_setup ()
        _nodes_file=""
        _num_nodes=3
        _public_addresses_file=""
+       _recovery_lock_use_command=false
        _socket_wrapper=""
        _use_ipv6=false
 
        set -e
 
-       while getopts "FN:n:P:S:6h?" _opt ; do
+       while getopts "FN:n:P:RS:6h?" _opt ; do
                case "$_opt" in
                F) _disable_failover=true ;;
                N) _nodes_file="$OPTARG" ;;
                n) _num_nodes="$OPTARG" ;;
                P) _public_addresses_file="$OPTARG" ;;
+               R) _recovery_lock_use_command=true ;;
                S) _socket_wrapper="$OPTARG" ;;
                6) _use_ipv6=true ;;
                \?|h) local_daemons_setup_usage ;;
@@ -188,6 +191,11 @@ local_daemons_setup ()
                                       $_use_ipv6 >"$_public_addresses_all"
        fi
 
+       _recovery_lock="${directory}/rec.lock"
+       if $_recovery_lock_use_command ; then
+               _recovery_lock="! ${CTDB_CLUSTER_MUTEX_HELPER} ${_recovery_lock}"
+       fi
+
        if [ -n "$_socket_wrapper" ] ; then
                setup_socket_wrapper "$_socket_wrapper"
        fi
@@ -221,7 +229,7 @@ local_daemons_setup ()
        log level = INFO
 
 [cluster]
-       recovery lock = ${directory}/rec.lock
+       recovery lock = ${_recovery_lock}
        node address = ${_node_ip}
 
 [database]