]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-tests: Put recovery lock for local daemons into a subdirectory
authorMartin Schwenke <martin@meltin.net>
Fri, 10 Jan 2020 03:04:14 +0000 (14:04 +1100)
committerAmitay Isaacs <amitay@samba.org>
Tue, 21 Jan 2020 11:39:40 +0000 (11:39 +0000)
This makes it more like the way it works with a cluster filesystem.
It also allows the subdirectory to be manipulated in tests.

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

index 6ae1f1c2441801e952b71149079e49c124eb4398..e45a79c3e82d7f410ffc9ab3dec2f94d76407b26 100755 (executable)
@@ -191,7 +191,9 @@ local_daemons_setup ()
                                       $_use_ipv6 >"$_public_addresses_all"
        fi
 
-       _recovery_lock="${directory}/rec.lock"
+       _recovery_lock_dir="${directory}/shared/.ctdb"
+       mkdir -p "$_recovery_lock_dir"
+       _recovery_lock="${_recovery_lock_dir}/rec.lock"
        if $_recovery_lock_use_command ; then
                _helper="${CTDB_SCRIPTS_HELPER_BINDIR}/ctdb_mutex_fcntl_helper"
                _t="! ${_helper} ${_recovery_lock}"