The branch, master has been updated
via 0ccf842 ctdb-scripts: Use "ctdb ip all" instead of "ctdb ip -n all"
via 94898dd ctdb-doc: Stop using "ctdb -n all ..."
via f7c414d ctdb-tests: Change "ctdb ip -n all" to "ctdb ip all"
via 8c2048b ctdb-tools: Support "ctdb ip all" as equivalent to "ctdb ip
-n all"
via 5d2c943 ctdb-tests: Do not test "ctdb nodestatus -n all"
via a94378e ctdb-tests: Drop use of "ctdb delip -n all" in simple tests
via c607989 ctdb-tests: Drop simple uses of "ctdb -n all ..." from
simple tests
from c466ad4 texpect: undefined symbol rep_fprintf
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0ccf842e12c0b5de52a89f1b6d74eba3a5e3feb5
Author: Martin Schwenke <mar...@meltin.net>
Date: Tue Oct 20 12:38:38 2015 +1100
ctdb-scripts: Use "ctdb ip all" instead of "ctdb ip -n all"
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Amitay Isaacs <ami...@gmail.com>
Autobuild-User(master): Amitay Isaacs <ami...@samba.org>
Autobuild-Date(master): Fri Oct 23 06:44:45 CEST 2015 on sn-devel-104
commit 94898dd5b0770683181ece15a9ad9c9f5d9286e9
Author: Martin Schwenke <mar...@meltin.net>
Date: Tue Oct 20 12:37:17 2015 +1100
ctdb-doc: Stop using "ctdb -n all ..."
This is deprecated. For many commands it doesn't make sense. Instead
of "ctdb ip -n all" use "ctdb ip all".
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Amitay Isaacs <ami...@gmail.com>
commit f7c414d4c972d388c8281f7306636db85d9fa1c4
Author: Martin Schwenke <mar...@meltin.net>
Date: Tue Oct 20 12:28:16 2015 +1100
ctdb-tests: Change "ctdb ip -n all" to "ctdb ip all"
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Amitay Isaacs <ami...@gmail.com>
commit 8c2048b9d56ae432ecb8400591ceefc73d7d8cc6
Author: Martin Schwenke <mar...@meltin.net>
Date: Tue Oct 20 12:25:01 2015 +1100
ctdb-tools: Support "ctdb ip all" as equivalent to "ctdb ip -n all"
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Amitay Isaacs <ami...@gmail.com>
commit 5d2c9436ed4824b3f381665361ab29c089f175c3
Author: Martin Schwenke <mar...@meltin.net>
Date: Tue Oct 20 12:12:39 2015 +1100
ctdb-tests: Do not test "ctdb nodestatus -n all"
This is low value and will no longer be supported.
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Amitay Isaacs <ami...@gmail.com>
commit a94378e3f1a0f94c2910ed084a5d182f3c0e38e3
Author: Martin Schwenke <mar...@meltin.net>
Date: Mon Oct 19 16:51:48 2015 +1100
ctdb-tests: Drop use of "ctdb delip -n all" in simple tests
Add new function delete_ip_from_all_nodes(). Also
ctdb_get_all_pnns().
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Amitay Isaacs <ami...@gmail.com>
commit c607989d91b64d837253aae794b1a3d6013eb3e0
Author: Martin Schwenke <mar...@meltin.net>
Date: Mon Oct 19 16:05:44 2015 +1100
ctdb-tests: Drop simple uses of "ctdb -n all ..." from simple tests
None of these uses of -n are particularly useful. "-n all" will be
deprecated.
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Amitay Isaacs <ami...@gmail.com>
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/statd-callout | 2 +-
ctdb/doc/ctdb.1.xml | 21 +++--------------
ctdb/tests/complex/18_ctdb_reloadips.sh | 6 ++---
ctdb/tests/scripts/integration.bash | 30 +++++++++++++++++++++++-
ctdb/tests/simple/06_ctdb_getpid.sh | 10 +-------
ctdb/tests/simple/11_ctdb_ip.sh | 4 ++--
ctdb/tests/simple/12_ctdb_getdebug.sh | 10 ++------
ctdb/tests/simple/14_ctdb_statistics.sh | 7 +-----
ctdb/tests/simple/16_ctdb_config_add_ip.sh | 2 +-
ctdb/tests/simple/20_delip_iface_gc.sh | 2 +-
ctdb/tests/simple/23_ctdb_moveip.sh | 4 ++--
ctdb/tests/simple/25_dumpmemory.sh | 17 --------------
ctdb/tests/simple/35_set_recmaster.sh | 18 +++++++--------
ctdb/tests/simple/60_recoverd_missing_ip.sh | 2 +-
ctdb/tests/simple/scripts/local_daemons.bash | 2 +-
ctdb/tests/tool/stubby.nodestatus.002.sh | 8 +++----
ctdb/tests/tool/stubby.nodestatus.003.sh | 30 ------------------------
ctdb/tests/tool/stubby.nodestatus.004.sh | 31 -------------------------
ctdb/tests/tool/stubby.nodestatus.005.sh | 34 ----------------------------
ctdb/tools/ctdb.c | 4 ++++
ctdb/web/testing.html | 4 ++--
21 files changed, 67 insertions(+), 181 deletions(-)
delete mode 100755 ctdb/tests/tool/stubby.nodestatus.003.sh
delete mode 100755 ctdb/tests/tool/stubby.nodestatus.004.sh
delete mode 100755 ctdb/tests/tool/stubby.nodestatus.005.sh
Changeset truncated at 500 lines:
diff --git a/ctdb/config/statd-callout b/ctdb/config/statd-callout
index 3b83446..e2f4c28 100755
--- a/ctdb/config/statd-callout
+++ b/ctdb/config/statd-callout
@@ -159,7 +159,7 @@ case "$1" in
# Construct a sed expression to take catdb output and produce pairs of:
# server-IP client-IP
# but only for the server-IPs that are hosted on this node.
- ctdb_all_ips=$(ctdb ip -n all | tail -n +2)
+ ctdb_all_ips=$(ctdb ip all | tail -n +2)
sed_expr=$(echo "$ctdb_all_ips" |
awk -v pnn=$pnn 'pnn == $2 { \
ip = $1; gsub(/\./, "\\.", ip); \
diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml
index d5bcbbf..0ff848c 100644
--- a/ctdb/doc/ctdb.1.xml
+++ b/ctdb/doc/ctdb.1.xml
@@ -395,17 +395,6 @@ Recovery master:0
If PNN-LIST is provided then status is given for
the indicated node(s).
</para>
-
- <para>
- By default, <command>ctdb nodestatus</command> gathers
- status from the local node. However, if invoked with "-n
- all" (or similar) then status is gathered from the given
- node(s). In particular <command>ctdb nodestatus
- all</command> and <command>ctdb nodestatus -n
- all</command> will produce different output. It is
- possible to provide 2 different nodespecs (with and
- without "-n") but the output is usually confusing!
- </para>
</listitem>
</itemizedlist>
@@ -510,11 +499,8 @@ pnn:3 192.168.2.203 OK
<refsect3>
<title>Example</title>
<screen>
-# ctdb ping -n all
+# ctdb ping
response from 0 time=0.000054 sec (3 clients)
-response from 1 time=0.000144 sec (2 clients)
-response from 2 time=0.000105 sec (2 clients)
-response from 3 time=0.000114 sec (2 clients)
</screen>
</refsect3>
</refsect2>
@@ -548,7 +534,7 @@ name:eth2 link:up references:1
<refsect2>
<title>ip</title>
<para>
- This command will display the list of public addresses that are
provided by the cluster and which physical node is currently serving this ip.
By default this command will ONLY show those public addresses that are known to
the node itself. To see the full list of all public ips across the cluster you
must use "ctdb ip -n all".
+ This command will display the list of public addresses that are
provided by the cluster and which physical node is currently serving this ip.
By default this command will ONLY show those public addresses that are known to
the node itself. To see the full list of all public ips across the cluster you
must use "ctdb ip all".
</para>
<refsect3>
<title>Example</title>
@@ -914,8 +900,7 @@ DB Statistics: locking.tdb
<para>
This command only affects the run-time setting of a single
CTDB node. This setting <emphasis>must</emphasis> be changed
- on all nodes simultaneously by specifying <option>-n
- all</option> (or similar). For information about configuring
+ on all nodes simultaneously. For information about configuring
the recovery lock file please see the
<citetitle>CTDB_RECOVERY_LOCK</citetitle> entry in
<citerefentry><refentrytitle>ctdbd.conf</refentrytitle>
diff --git a/ctdb/tests/complex/18_ctdb_reloadips.sh
b/ctdb/tests/complex/18_ctdb_reloadips.sh
index 71f997c..9a40835 100755
--- a/ctdb/tests/complex/18_ctdb_reloadips.sh
+++ b/ctdb/tests/complex/18_ctdb_reloadips.sh
@@ -46,11 +46,11 @@ select_test_node_and_ips
# The initial search is for a 10.B.0.0/16 network since some
# configurations may use a whole class B for the private network.
# Check that there are no public IP addresses (as reported by "ctdb ip
-# -n -all") or other IP addresses (as reported by "ip addr show") with
+# all") or other IP addresses (as reported by "ip addr show") with
# the provided prefix. Note that this is an IPv4-specific test.
echo "Getting public IP information from CTDB..."
-try_command_on_node any "$CTDB ip -X -v -n all"
+try_command_on_node any "$CTDB ip -X -v all"
ctdb_ip_info=$(echo "$out" | awk -F'|' 'NR > 1 { print $2, $3, $5 }')
echo "Getting IP information from interfaces..."
@@ -70,7 +70,7 @@ for b in $(seq 0 255) ; do
fi
done <<<"$ip_addr_info"
- # Does the prefix match any public IP address "ctdb ip -n all"?
+ # Does the prefix match any public IP address "ctdb ip all"?
while read ip pnn iface ; do
if [ "${ip#${prefix}.}" != "$ip" ] ; then
prefix=""
diff --git a/ctdb/tests/scripts/integration.bash
b/ctdb/tests/scripts/integration.bash
index 139a9a2..e3fb3d4 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -169,7 +169,7 @@ all_ips_on_node()
_select_test_node_and_ips ()
{
try_command_on_node any \
- "$CTDB ip -X -n all | awk -F'|' 'NR > 1 { print \$2, \$3 }'"
+ "$CTDB ip -X all | awk -F'|' 'NR > 1 { print \$2, \$3 }'"
test_node="" # this matches no PNN
test_node_ips=""
@@ -229,6 +229,34 @@ get_test_ip_mask_and_iface ()
echo "$test_ip/$mask is on $iface"
}
+ctdb_get_all_pnns ()
+{
+ try_command_on_node -q all "$CTDB pnn | sed -e 's@PNN:@@'"
+ all_pnns="$out"
+}
+
+# The subtlety is that "ctdb delip" will fail if the IP address isn't
+# configured on a node...
+delete_ip_from_all_nodes ()
+{
+ _ip="$1"
+
+ ctdb_get_all_pnns
+
+ _nodes=""
+
+ for _pnn in $all_pnns ; do
+ all_ips_on_node $_pnn
+ while read _i _n ; do
+ if [ "$_ip" = "$_i" ] ; then
+ _nodes="${_nodes}${_nodes:+,}${_pnn}"
+ fi
+ done <<<"$out" # bashism
+ done
+
+ try_command_on_node -pq "$_nodes" "$CTDB delip $_ip"
+}
+
#######################################
# Wait until either timeout expires or command succeeds. The command
diff --git a/ctdb/tests/simple/06_ctdb_getpid.sh
b/ctdb/tests/simple/06_ctdb_getpid.sh
index 7152ad4..3013734 100755
--- a/ctdb/tests/simple/06_ctdb_getpid.sh
+++ b/ctdb/tests/simple/06_ctdb_getpid.sh
@@ -15,8 +15,6 @@ Steps:
2. Run 'ctdb getpid -n <number>' on the nodes to check the PID of the
ctdbd process.
3. Verify that the output is valid.
-4. Verify that with the '-n all' option the command shows the PIDs on
- all the nodes
Expected results:
@@ -32,8 +30,6 @@ set -e
cluster_is_healthy
-# This is an attempt at being independent of the number of nodes
-# reported by "ctdb getpid -n all".
try_command_on_node 0 "$CTDB listnodes | wc -l"
num_nodes="$out"
echo "There are $num_nodes nodes..."
@@ -43,9 +39,6 @@ echo "There are $num_nodes nodes..."
try_command_on_node -v 0 "onnode -q all $CTDB getpid"
pids_onnode="$out"
-try_command_on_node -v 0 "$CTDB getpid -n all"
-pids_getpid_all="$out"
-
cmd=""
n=0
while [ $n -lt $num_nodes ] ; do
@@ -55,8 +48,7 @@ done
try_command_on_node -v 0 "( $cmd )"
pids_getpid_n="$out"
-if [ "$pids_onnode" = "$pids_getpid_all" -a \
- "$pids_getpid_all" = "$pids_getpid_n" ] ; then
+if [ "$pids_onnode" = "$pids_getpid_n" ] ; then
echo "They're the same... cool!"
else
echo "Error: they differ."
diff --git a/ctdb/tests/simple/11_ctdb_ip.sh b/ctdb/tests/simple/11_ctdb_ip.sh
index 0e02b5e..8bca2c6 100755
--- a/ctdb/tests/simple/11_ctdb_ip.sh
+++ b/ctdb/tests/simple/11_ctdb_ip.sh
@@ -32,7 +32,7 @@ set -e
cluster_is_healthy
echo "Getting list of public IPs..."
-try_command_on_node -v 1 "$CTDB ip -n all | tail -n +2"
+try_command_on_node -v 1 "$CTDB ip all | tail -n +2"
ips=$(echo "$out" | sed \
-e 's@ node\[@ @' \
-e 's@\].*$@@')
@@ -55,7 +55,7 @@ fi
[ "$testfailures" != 1 ] && echo "Looks good!"
-cmd="$CTDB -X ip -n all | tail -n +2"
+cmd="$CTDB -X ip all | tail -n +2"
echo "Checking that \"$cmd\" produces expected output..."
try_command_on_node 1 "$cmd"
diff --git a/ctdb/tests/simple/12_ctdb_getdebug.sh
b/ctdb/tests/simple/12_ctdb_getdebug.sh
index cdd9e34..39028ac 100755
--- a/ctdb/tests/simple/12_ctdb_getdebug.sh
+++ b/ctdb/tests/simple/12_ctdb_getdebug.sh
@@ -13,8 +13,6 @@ Steps:
1. Verify that the status on all of the ctdb nodes is 'OK'.
2. Get the current debug level on a node, using 'ctdb getdebug -n <node>'.
-3. Verify that pipe-separated output is generated with the -X option.
-4. Verify that the '-n all' option shows the debug level on all nodes.
Expected results:
@@ -41,9 +39,6 @@ sanity_check_output \
'^Node [[:digit:]]+ is at debug level [[:alpha:]]+ \([[:digit:]]+\)$' \
"$out"
-try_command_on_node -v 1 "$CTDB getdebug -n all"
-getdebug_all="$out"
-
cmd=""
n=0
while [ $n -lt $num_nodes ] ; do
@@ -53,8 +48,7 @@ done
try_command_on_node -v 1 "$cmd"
getdebug_n="$out"
-if [ "$getdebug_onnode" = "$getdebug_all" -a \
- "$getdebug_all" = "$getdebug_n" ] ; then
+if [ "$getdebug_onnode" = "$getdebug_n" ] ; then
echo "They're the same... cool!"
else
echo "Error: they differ."
@@ -69,7 +63,7 @@ while read line ; do
seps="${seps}${seps:+${nl}}|Name|Level|${nl}${t}"
done <<<"$getdebug_onnode"
-cmd="$CTDB -X getdebug -n all"
+cmd="onnode -q all $CTDB -X getdebug"
echo "Checking that \"$cmd\" produces expected output..."
try_command_on_node 1 "$cmd"
diff --git a/ctdb/tests/simple/14_ctdb_statistics.sh
b/ctdb/tests/simple/14_ctdb_statistics.sh
index 9cc5ac1..3dd55e0 100755
--- a/ctdb/tests/simple/14_ctdb_statistics.sh
+++ b/ctdb/tests/simple/14_ctdb_statistics.sh
@@ -1,3 +1,4 @@
+
#!/bin/bash
test_info()
@@ -16,8 +17,6 @@ Steps:
1. Verify that the status on all of the ctdb nodes is 'OK'.
2. Run 'ctdb statistics' on a node, and verify that the output is
valid.
-3. Repeat the command with the '-n all' option and verify that the
- output is valid.
Expected results:
@@ -38,7 +37,3 @@ pattern='^(CTDB version 1|Current time of
statistics[[:space:]]*:.*|Statistics c
try_command_on_node -v 1 "$CTDB statistics"
sanity_check_output 40 "$pattern" "$out"
-
-try_command_on_node -v 1 "$CTDB statistics -n all"
-
-sanity_check_output 40 "$pattern" "$out"
diff --git a/ctdb/tests/simple/16_ctdb_config_add_ip.sh
b/ctdb/tests/simple/16_ctdb_config_add_ip.sh
index b5d76ea..55527ad 100755
--- a/ctdb/tests/simple/16_ctdb_config_add_ip.sh
+++ b/ctdb/tests/simple/16_ctdb_config_add_ip.sh
@@ -25,7 +25,7 @@ select_test_node_and_ips
get_test_ip_mask_and_iface
echo "Deleting IP $test_ip from all nodes"
-try_command_on_node $test_node $CTDB delip -n all $test_ip
+delete_ip_from_all_nodes $test_ip
wait_until_ips_are_on_node '!' $test_node $test_ip
# Debugging...
diff --git a/ctdb/tests/simple/20_delip_iface_gc.sh
b/ctdb/tests/simple/20_delip_iface_gc.sh
index 83de495..23d1d6b 100755
--- a/ctdb/tests/simple/20_delip_iface_gc.sh
+++ b/ctdb/tests/simple/20_delip_iface_gc.sh
@@ -19,7 +19,7 @@ cluster_is_healthy
ctdb_restart_when_done
echo "Getting public IPs information..."
-try_command_on_node -v any "$CTDB ip -v -n all -X | tail -n +2"
+try_command_on_node -v any "$CTDB ip -v all -X | tail -n +2"
ip_info="$out"
# Select the first node and find out its interfaces
diff --git a/ctdb/tests/simple/23_ctdb_moveip.sh
b/ctdb/tests/simple/23_ctdb_moveip.sh
index f6e9027..f92d7f7 100755
--- a/ctdb/tests/simple/23_ctdb_moveip.sh
+++ b/ctdb/tests/simple/23_ctdb_moveip.sh
@@ -50,10 +50,10 @@ fi
echo "Target node is ${to_node}"
echo "Turning off DeterministicIPs..."
-try_command_on_node 0 $CTDB setvar DeterministicIPs 0 -n all
+try_command_on_node -q all $CTDB setvar DeterministicIPs 0
echo "Turning on NoIPFailback..."
-try_command_on_node 0 $CTDB setvar NoIPFailback 1 -n all
+try_command_on_node -q all $CTDB setvar NoIPFailback 1
echo "Attempting to move ${test_ip} from node ${test_node} to node ${to_node}"
try_command_on_node $test_node $CTDB moveip $test_ip $to_node
diff --git a/ctdb/tests/simple/25_dumpmemory.sh
b/ctdb/tests/simple/25_dumpmemory.sh
index 4082da1..4d6cc83 100755
--- a/ctdb/tests/simple/25_dumpmemory.sh
+++ b/ctdb/tests/simple/25_dumpmemory.sh
@@ -13,8 +13,6 @@ Steps:
1. Verify that the status on all of the ctdb nodes is 'OK'.
2. Run 'ctdb dumpmemory' and verify that it shows expected output
-3. Verify that the command takes the '-n all' option and that it
- causes output for all nodes to be displayed.
Expected results:
@@ -35,18 +33,3 @@ try_command_on_node -v 0 "$CTDB dumpmemory"
pat='^([[:space:]].+[[:space:]]+contains[[:space:]]+[[:digit:]]+ bytes
in[[:space:]]+[[:digit:]]+ blocks \(ref
[[:digit:]]+\)[[:space:]]+0x[[:xdigit:]]+|[[:space:]]+reference to: .+|full
talloc report on .+ \(total[[:space:]]+[[:digit:]]+ bytes in [[:digit:]]+
blocks\))$'
sanity_check_output 10 "$pat" "$out"
-
-echo "Checking output using '-n all'..."
-
-try_command_on_node 0 "$CTDB listnodes"
-num_nodes=$(echo "$out" | wc -l)
-
-try_command_on_node 0 "$CTDB dumpmemory" -n all
-sanity_check_output 10 "$pat" "$out"
-
-if [ $(fgrep -c 'full talloc report on' <<<"$out") -eq $num_nodes ] ; then
- echo "OK: there looks to be output for all $num_nodes nodes"
-else
- echo "BAD: there not look to be output for all $num_nodes nodes"
- exit 1
-fi
diff --git a/ctdb/tests/simple/35_set_recmaster.sh
b/ctdb/tests/simple/35_set_recmaster.sh
index 7c745e4..fe78809 100755
--- a/ctdb/tests/simple/35_set_recmaster.sh
+++ b/ctdb/tests/simple/35_set_recmaster.sh
@@ -43,7 +43,7 @@ wait_until_generation_has_changed ()
}
echo "Check that recovery lock is set the same on all nodes..."
-try_command_on_node -v any $CTDB -n all getreclock
+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"
@@ -68,8 +68,8 @@ echo "Remember original recovery lock file:
\"${orig_reclock}\""
echo
echo "Unset and test the recovery lock on all nodes..."
-try_command_on_node any $CTDB -n all setreclock
-try_command_on_node -v any $CTDB -n all getreclock
+try_command_on_node -q all $CTDB setreclock
+try_command_on_node -v -q all $CTDB getreclock
t=$(sort -u <<<"$out")
if [ "$t" = "No reclock file used." ] ; then
echo "GOOD: Recovery lock unset on all nodes"
@@ -85,14 +85,14 @@ 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 any $CTDB -n all setreclock "$alt"
-try_command_on_node -v any $CTDB -n all getreclock
+try_command_on_node -q all $CTDB setreclock "$alt"
+try_command_on_node -v -q all $CTDB getreclock
t=$(echo "$out" | sed -e 's@^Reclock file:@@' | 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 -v any rm -v "$alt" || true
+ try_command_on_node -vf all rm -v "$alt" || true
exit 1
fi
@@ -102,9 +102,9 @@ echo "Current generation is ${generation}"
echo
echo "Restore and test the recovery lock on all nodes..."
-try_command_on_node any $CTDB -n all setreclock "$orig_reclock"
-try_command_on_node -v any rm -v "$alt"
-try_command_on_node -v any $CTDB -n all getreclock
+try_command_on_node -q all $CTDB setreclock "$orig_reclock"
+try_command_on_node -v all rm -vf "$alt"
+try_command_on_node -v -q all $CTDB getreclock
t=$(echo "$out" | sed -e 's@^Reclock file:@@' | sort -u)
if [ "$t" = "$orig_reclock" ] ; then
echo "GOOD: Recovery lock restored on all nodes"
diff --git a/ctdb/tests/simple/60_recoverd_missing_ip.sh
b/ctdb/tests/simple/60_recoverd_missing_ip.sh
index 9ad7b69..36271d1 100755
--- a/ctdb/tests/simple/60_recoverd_missing_ip.sh
+++ b/ctdb/tests/simple/60_recoverd_missing_ip.sh
@@ -30,7 +30,7 @@ echo "Running test against node $test_node and IP $test_ip"
get_test_ip_mask_and_iface
echo "Deleting IP $test_ip from all nodes"
-try_command_on_node $test_node $CTDB delip -n all $test_ip
+delete_ip_from_all_nodes $test_ip
wait_until_ips_are_on_node ! $test_node $test_ip
try_command_on_node -v all $CTDB ip
diff --git a/ctdb/tests/simple/scripts/local_daemons.bash
b/ctdb/tests/simple/scripts/local_daemons.bash
index 5071b1e..92ec391 100644
--- a/ctdb/tests/simple/scripts/local_daemons.bash
+++ b/ctdb/tests/simple/scripts/local_daemons.bash
@@ -22,7 +22,7 @@ export CTDB_NODES="${TEST_VAR_DIR}/nodes.txt"
daemons_stop ()
{
echo "Attempting to politely shutdown daemons..."
- onnode 1 $CTDB shutdown -n all || true
+ onnode -q all $CTDB shutdown || true
echo "Sleeping for a while..."
sleep_for 1
diff --git a/ctdb/tests/tool/stubby.nodestatus.002.sh
b/ctdb/tests/tool/stubby.nodestatus.002.sh
index f5b1909..a3a7a42 100755
--- a/ctdb/tests/tool/stubby.nodestatus.002.sh
+++ b/ctdb/tests/tool/stubby.nodestatus.002.sh
@@ -2,19 +2,19 @@
. "${TEST_SCRIPTS_DIR}/unit.sh"
-define_test "-n all, 3 nodes, all OK"
+define_test "all, 3 nodes, 1 disconnected"
-required_result 0 <<EOF
+required_result 1 <<EOF
Number of nodes:3
pnn:0 192.168.20.41 OK
-pnn:1 192.168.20.42 OK
+pnn:1 192.168.20.42 DISCONNECTED|INACTIVE
pnn:2 192.168.20.43 OK (THIS NODE)
EOF
simple_test all <<EOF
NODEMAP
0 192.168.20.41 0x0
-1 192.168.20.42 0x0
+1 192.168.20.42 0x1
2 192.168.20.43 0x0 CURRENT RECMASTER
IFACES
diff --git a/ctdb/tests/tool/stubby.nodestatus.003.sh
b/ctdb/tests/tool/stubby.nodestatus.003.sh
deleted file mode 100755
index a3a7a42..0000000
--- a/ctdb/tests/tool/stubby.nodestatus.003.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "all, 3 nodes, 1 disconnected"
-
-required_result 1 <<EOF
-Number of nodes:3
-pnn:0 192.168.20.41 OK
-pnn:1 192.168.20.42 DISCONNECTED|INACTIVE
-pnn:2 192.168.20.43 OK (THIS NODE)
-EOF
-
-simple_test all <<EOF
-NODEMAP
-0 192.168.20.41 0x0
-1 192.168.20.42 0x1
-2 192.168.20.43 0x0 CURRENT RECMASTER
-
-IFACES
-:Name:LinkStatus:References:
-:eth2:1:2:
-:eth1:1:4:
-
-VNNMAP
-654321
-0
-1
-2
-EOF
diff --git a/ctdb/tests/tool/stubby.nodestatus.004.sh
b/ctdb/tests/tool/stubby.nodestatus.004.sh
deleted file mode 100755
index bc98905..0000000
--- a/ctdb/tests/tool/stubby.nodestatus.004.sh
+++ /dev/null
@@ -1,31 +0,0 @@
--
Samba Shared Repository
