Revert "ctdb-tests: Drop uses of "onnode any ..." in testcases"

Fix missing Reviewed-by: tag.

This reverts commit aa5b214eaa88414c87410fd068fe7624e9790185.

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

diff --git a/ctdb/tests/CLUSTER/complex/18_ctdb_reloadips.sh b/ctdb/tests/CLUSTER/complex/18_ctdb_reloadips.sh
index 150aeea5f14df7f6f07737ecce59697cce44be7d..f4df2b1b08b2140fb48adb50ccc7f578f93ed9d2 100755 (executable)
--- a/ctdb/tests/CLUSTER/complex/18_ctdb_reloadips.sh
+++ b/ctdb/tests/CLUSTER/complex/18_ctdb_reloadips.sh
@@ -38,7 +38,7 @@ select_test_node_and_ips
 # the provided prefix.  Note that this is an IPv4-specific test.
 
 echo "Getting public IP information from CTDB..."
-ctdb_onnode "$test_node" "ip -X -v all"
+try_command_on_node any "$CTDB ip -X -v all"
 ctdb_ip_info=$(awk -F'|' 'NR > 1 { print $2, $3, $5 }' "$outfile")
 
 echo "Getting IP information from interfaces..."
@@ -215,7 +215,7 @@ do_ctdb_reloadips
 
 check_ips $test_node "$iface" "$prefix" 1 $new_ip_max
 
-ctdb_onnode "$test_node" sync
+try_command_on_node any $CTDB sync
 
 ####################
 
@@ -229,7 +229,7 @@ do_ctdb_reloadips
 
 check_ips $test_node "$iface" "$prefix" 2 $new_ip_max
 
-ctdb_onnode "$test_node" sync
+try_command_on_node any $CTDB sync
 
 ####################
 
@@ -244,7 +244,7 @@ do_ctdb_reloadips
 
 check_ips $test_node "$iface" "$prefix" $start $new_ip_max
 
-ctdb_onnode "$test_node" sync
+try_command_on_node any $CTDB sync
 
 ####################
 

diff --git a/ctdb/tests/CLUSTER/complex/31_nfs_tickle.sh b/ctdb/tests/CLUSTER/complex/31_nfs_tickle.sh
index e3f1540aedbfcf831c321c30c403a50327508ccd..e3c362c347ae00a6d4e491b150ca43d62aa77a81 100755 (executable)
--- a/ctdb/tests/CLUSTER/complex/31_nfs_tickle.sh
+++ b/ctdb/tests/CLUSTER/complex/31_nfs_tickle.sh
@@ -29,14 +29,15 @@ set -e
 
 ctdb_test_init
 
+# We need this for later, so we know how long to run nc for.
+try_command_on_node any $CTDB getvar MonitorInterval
+monitor_interval="${out#*= }"
+#echo "Monitor interval on node $test_node is $monitor_interval seconds."
+
 select_test_node_and_ips
 try_command_on_node $test_node "$CTDB listnodes | wc -l"
 numnodes="$out"
 
-# We need this for later, so we know how long to run nc for.
-ctdb_onnode "$test_node" "getvar MonitorInterval"
-monitor_interval="${out#*= }"
-
 test_port=2049
 
 echo "Connecting to node ${test_node} on IP ${test_ip}:${test_port} with netcat..."

diff --git a/ctdb/tests/CLUSTER/complex/34_nfs_tickle_restart.sh b/ctdb/tests/CLUSTER/complex/34_nfs_tickle_restart.sh
index b81510d372298000980b9116264ead1aee5b3073..5ab8a34faecb8121ff0950bf395a0c5e6c6ae59a 100755 (executable)
--- a/ctdb/tests/CLUSTER/complex/34_nfs_tickle_restart.sh
+++ b/ctdb/tests/CLUSTER/complex/34_nfs_tickle_restart.sh
@@ -27,6 +27,11 @@ set -e
 
 ctdb_test_init
 
+# We need this for later, so we know how long to run nc for.
+try_command_on_node any $CTDB getvar MonitorInterval
+monitor_interval="${out#*= }"
+#echo "Monitor interval on node $test_node is $monitor_interval seconds."
+
 select_test_node_and_ips
 try_command_on_node $test_node "$CTDB listnodes -X"
 listnodes_output="$out"

diff --git a/ctdb/tests/INTEGRATION/database/readonly.001.basic.sh b/ctdb/tests/INTEGRATION/database/readonly.001.basic.sh
index aeb974028e65b997ce413effe94800169f566bda..20faa3aa03b86ada6d02a1fdcddacdd907d7aabf 100755 (executable)
--- a/ctdb/tests/INTEGRATION/database/readonly.001.basic.sh
+++ b/ctdb/tests/INTEGRATION/database/readonly.001.basic.sh
@@ -92,7 +92,7 @@ check_readonly ()
 ######################################################################
 
 echo "Get list of nodes..."
-ctdb_onnode 0 "-X listnodes"
+try_command_on_node any $CTDB -X listnodes
 all_nodes=$(awk -F'|' '{print $2}' "$outfile")
 
 ######################################################################

diff --git a/ctdb/tests/INTEGRATION/database/recovery.001.volatile.sh b/ctdb/tests/INTEGRATION/database/recovery.001.volatile.sh
index ffe322037f57b104e659527f41b8b5ddd23e0d23..e523e835de70b19a9d518b407fa829ef705e3f72 100755 (executable)
--- a/ctdb/tests/INTEGRATION/database/recovery.001.volatile.sh
+++ b/ctdb/tests/INTEGRATION/database/recovery.001.volatile.sh
@@ -38,7 +38,7 @@ status=0
 
 # Make sure node 0 is not the recovery master
 echo "find out which node is recmaster"
-ctdb_onnode 0 recmaster
+try_command_on_node any $CTDB recmaster
 recmaster="$out"
 if [ "$recmaster" = "0" ]; then
     echo "node 0 is recmaster, disable recmasterrole on node 0"
@@ -56,7 +56,7 @@ if [ "$recmaster" = "0" ]; then
     try_command_on_node 0 $CTDB continue
     wait_until_node_has_status 0 notstopped
 
-    ctdb_onnode 0 recmaster
+    try_command_on_node any $CTDB recmaster
     recmaster="$out"
     if [ "$recmaster" = "0" ]; then
        echo "failed to move recmaster to different node"

diff --git a/ctdb/tests/INTEGRATION/failover/pubips.012.reloadips.sh b/ctdb/tests/INTEGRATION/failover/pubips.012.reloadips.sh
index a3bb3af648041f9d2ca46c33902cc51a699c356e..829b83930dacd008da12f65237c50055d294f7fd 100755 (executable)
--- a/ctdb/tests/INTEGRATION/failover/pubips.012.reloadips.sh
+++ b/ctdb/tests/INTEGRATION/failover/pubips.012.reloadips.sh
@@ -33,7 +33,7 @@ do_ctdb_reloadips ()
        local retry_max=10
        local retry_count=0
        while : ; do
-               if ctdb_onnode "$test_node" "reloadips all" ; then
+               if try_command_on_node any "$CTDB reloadips all" ; then
                        return 0
                fi
 
@@ -73,7 +73,7 @@ GOOD: node $test_node is no longer hosting IP $test_ip:
 $out
 EOF
 
-ctdb_onnode "$test_node" sync
+try_command_on_node any $CTDB sync
 
 
 echo "Restoring addresses"
@@ -94,7 +94,7 @@ GOOD: node $test_node has these addresses:
 $out
 EOF
 
-ctdb_onnode "$test_node" sync
+try_command_on_node any $CTDB sync
 
 
 echo "Emptying public addresses file on $test_node"

diff --git a/ctdb/tests/INTEGRATION/failover/pubips.013.failover_noop.sh b/ctdb/tests/INTEGRATION/failover/pubips.013.failover_noop.sh
index 77f9a63e589c4c9986f28fe1564156fcadddec3b..488243d62601053b131f4b70ca11d7cee7472bd3 100755 (executable)
--- a/ctdb/tests/INTEGRATION/failover/pubips.013.failover_noop.sh
+++ b/ctdb/tests/INTEGRATION/failover/pubips.013.failover_noop.sh
@@ -16,13 +16,8 @@ ctdb_test_init -n
 echo "Starting CTDB with failover disabled..."
 ctdb_nodes_start_custom -F
 
-select_test_node
-
 echo "Getting IP allocation..."
-
-# $test_node set above by select_test_node()
-# shellcheck disable=SC2154
-try_command_on_node -v "$test_node" "$CTDB ip all | tail -n +2"
+try_command_on_node -v any "$CTDB ip all | tail -n +2"
 
 while read ip pnn ; do
        if [ "$pnn" != "-1" ] ; then
@@ -38,7 +33,7 @@ echo "Starting CTDB with an empty public addresses configuration..."
 ctdb_nodes_start_custom -P /dev/null
 
 echo "Trying explicit ipreallocate..."
-ctdb_onnode "$test_node" ipreallocate
+try_command_on_node any $CTDB ipreallocate
 
 echo "Good, that seems to work!"
 echo

diff --git a/ctdb/tests/INTEGRATION/failover/pubips.020.moveip.sh b/ctdb/tests/INTEGRATION/failover/pubips.020.moveip.sh
index 8daf3f516741d68e2405444af357bdb6fbc67310..68b5e079d66f31afd89de8b7e1044ee0e30e771d 100755 (executable)
--- a/ctdb/tests/INTEGRATION/failover/pubips.020.moveip.sh
+++ b/ctdb/tests/INTEGRATION/failover/pubips.020.moveip.sh
@@ -40,10 +40,7 @@ sanity_check_ips ()
 sanity_check_ips
 
 # Find a target node - it must be willing to host $test_ip
-
-# $test_node set above by select_test_node_and_ips()
-# shellcheck disable=SC2154
-try_command_on_node "$test_node" "$CTDB listnodes | wc -l"
+try_command_on_node any "$CTDB listnodes | wc -l"
 num_nodes="$out"
 to_node=""
 for i in $(seq 0 $(($num_nodes - 1)) ) ; do