ctdb-tests: Build cluster mutex path manually
authorMartin Schwenke <martin@meltin.net>
Thu, 7 Mar 2019 04:53:31 +0000 (15:53 +1100)
committerAmitay Isaacs <amitay@samba.org>
Fri, 15 Mar 2019 05:17:13 +0000 (05:17 +0000)
CTDB_CLUSTER_MUTEX_HELPER can't be depended on because it is only set
when the tests are not installed and setting it unconditionally for
this particular use would be wrong.

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

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@samba.org>
ctdb/tests/local_daemons.sh

index 07cf1e9..3c3897f 100755 (executable)
@@ -193,7 +193,8 @@ local_daemons_setup ()
 
        _recovery_lock="${directory}/rec.lock"
        if $_recovery_lock_use_command ; then
-               _recovery_lock="! ${CTDB_CLUSTER_MUTEX_HELPER} ${_recovery_lock}"
+               _helper="${CTDB_SCRIPTS_HELPER_BINDIR}/ctdb_mutex_fcntl_helper"
+               _recovery_lock="! ${_helper} ${_recovery_lock}"
        fi
 
        if [ -n "$_socket_wrapper" ] ; then