ctdb-tests: Replace "ctdb setrelock" test with "ctdb getreclock" test

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

diff --git a/ctdb/tests/simple/35_ctdb_getreclock.sh b/ctdb/tests/simple/35_ctdb_getreclock.sh
new file mode 100755 (executable)
index 0000000..5d24e2d
--- /dev/null
+++ b/ctdb/tests/simple/35_ctdb_getreclock.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+test_info()
+{
+    cat <<EOF
+Verify that "ctdb getreclock" gets the recovery lock correctly.
+
+Make sure the recovery lock is consistent across all nodes.
+EOF
+}
+
+. "${TEST_SCRIPTS_DIR}/integration.bash"
+
+ctdb_test_init "$@"
+
+set -e
+
+cluster_is_healthy
+
+echo "Check that recovery lock is set the same on all nodes..."
+try_command_on_node -v -q all $CTDB getreclock
+
+if [ -z "$out" ] ; then
+    echo "GOOD: Recovery lock is unset on all nodes"
+    exit 0
+fi
+
+n=$(echo "$out" | sort -u | wc -l)
+if [ "$n" = 1 ] ; then
+       echo "GOOD: All nodes have the same recovery lock setting"
+else
+       echo "BAD: Recovery lock setting differs across nodes"
+       exit 1
+fi

diff --git a/ctdb/tests/simple/35_set_reclock.sh b/ctdb/tests/simple/35_set_reclock.sh
deleted file mode 100755 (executable)
index 7a515ee..0000000
--- a/ctdb/tests/simple/35_set_reclock.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/bash
-
-test_info()
-{
-    cat <<EOF
-Verify that "ctdb setreclock" sets the recovery lock correctly.
-
-This test only does something when there is a recovery lock
-configured.
-EOF
-}
-
-. "${TEST_SCRIPTS_DIR}/integration.bash"
-
-ctdb_test_init "$@"
-
-set -e
-
-cluster_is_healthy
-
-# Reset configuration
-ctdb_restart_when_done
-
-get_generation ()
-{
-    local out
-    try_command_on_node any $CTDB status
-    generation=$(sed -n -e 's@^Generation:@@p' <<<"$out")
-}
-
-generation_has_changed ()
-{
-    local old_generation="$generation"
-    get_generation
-    [ "$old_generation" != "$generation" ]
-}
-
-wait_until_generation_has_changed ()
-{
-    echo
-    echo "Wait until generation has changed..."
-    wait_until 60 generation_has_changed
-}
-
-wait_until_recovered ()
-{
-    wait_until_generation_has_changed
-    wait_until_node_has_status all recovered
-}
-
-echo "Check that recovery lock is set the same on all nodes..."
-try_command_on_node -v -q all $CTDB getreclock
-n=$(echo "$out" | sort -u | wc -l)
-if [ "$n" = 1 ] ; then
-    echo "GOOD: All nodes have the same recovery lock setting"
-else
-    echo "BAD: Recovery lock setting differs across nodes"
-    exit 1
-fi
-
-echo
-echo "Check that recovery lock is actually enabled..."
-orig_reclock=$(echo "$out" | sort -u)
-if [ "$orig_reclock" != "" ] ; then
-    echo "OK: Recovery lock is set"
-else
-    echo "OOPS: Recovery lock is unset. Skipping remainder of test"
-    exit 0
-fi
-
-echo
-echo "Original recovery lock file: \"${orig_reclock}\""
-
-echo
-echo "Unset and test the recovery lock on all nodes..."
-try_command_on_node -pq all $CTDB setreclock
-wait_until_recovered
-try_command_on_node -v -q all $CTDB getreclock
-t=$(sort -u <<<"$out")
-if [ "$t" = "" ] ; then
-    echo "GOOD: Recovery lock unset on all nodes"
-else
-    echo "BAD: Recovery lock not unset on all nodes"
-    exit 1
-fi
-
-echo
-get_generation
-echo "Current generation is ${generation}"
-
-alt="${orig_reclock}.test"
-echo
-echo "Set alternative recovery lock (${alt}) and test on all nodes..."
-try_command_on_node -pq all $CTDB setreclock "$alt"
-wait_until_recovered
-try_command_on_node -v -q all $CTDB getreclock
-t=$(echo "$out" | sort -u)
-if [ "$t" = "$alt" ] ; then
-    echo "GOOD: Recovery lock set on all nodes"
-else
-    echo "BAD: Recovery lock not set on all nodes"
-    try_command_on_node -vf all rm -v "$alt" || true
-    exit 1
-fi
-
-# Setting or updating the recovery lock file must cause a recovery
-echo "Current generation is ${generation}"
-
-echo
-echo "Restore and test the recovery lock on all nodes..."
-try_command_on_node -pq all $CTDB setreclock "$orig_reclock"
-wait_until_recovered
-try_command_on_node -v all rm -vf "$alt"
-try_command_on_node -v -q all $CTDB getreclock
-t=$(echo "$out" | sort -u)
-if [ "$t" = "$orig_reclock" ] ; then
-    echo "GOOD: Recovery lock restored on all nodes"
-else
-    echo "BAD: Recovery lock not restored on all nodes"
-    exit 1
-fi
-
-echo "Current generation is ${generation}"