sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

Revert "ctdb-tests: Improve test portability"

Browse Source 
Fix missing Reviewed-by: tag.

This reverts commit 1079d6e3ae.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2020-07-22 14:42:53 +10:00 committed by Martin Schwenke
parent c83ece42e5
commit 635d5cfa31
1 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ctdb/tests/INTEGRATION/failover/pubips.040.NoIPTakeover.sh
View File

@ -22,26 +22,9 @@ echo "Wait until the ips are reallocated"
sleep_for 30
try_command_on_node 0 "$CTDB ipreallocate"
# sets: num
count_ips_on_node ()
{
local node="$1"
num=`try_command_on_node -v 1 "$CTDB ip" | grep -v Public | egrep " 1$" | wc -l`
echo "Number of addresses on node 1 : $num"
ctdb_onnode "$node" ip
# outfile is set by ctdb_onnode() above
# shellcheck disable=SC2154,SC2126
# * || true is needed to avoid command failure when there are no matches
# * Using "wc -l | tr -d '[:space:]'" is our standard
# pattern... and "grep -c" requires handling of special case
# for no match
num=$(grep -v 'Public' "$outfile" | \
grep " ${node}\$" | \
wc -l | \
tr -d '[:space:]')
echo "Number of addresses on node ${node}: ${num}"
}
count_ips_on_node 1
echo "Turning on NoIPTakeover on all nodes"
try_command_on_node all "$CTDB setvar NoIPTakeover 1"
@ -50,11 +33,12 @@ try_command_on_node 1 "$CTDB ipreallocate"
echo Disable node 1
try_command_on_node 1 "$CTDB disable"
try_command_on_node 1 "$CTDB ipreallocate"
count_ips_on_node 1
if [ "$num" != "0" ] ; then
test_fail "BAD: node 1 still hosts IP addresses"
fi
num=`try_command_on_node -v 1 "$CTDB ip" | grep -v Public | egrep " 1$" | wc -l`
echo "Number of addresses on node 1 : $num"
[ "$num" != "0" ] && {
echo "BAD: node 1 still hosts ip addresses"
exit 1
}
echo "Enable node 1 again"
@ -62,11 +46,12 @@ try_command_on_node 1 "$CTDB enable"
sleep_for 30
try_command_on_node 1 "$CTDB ipreallocate"
try_command_on_node 1 "$CTDB ipreallocate"
count_ips_on_node 1
if [ "$num" != "0" ] ; then
test_fail "BAD: node 1 took over IP addresses"
fi
num=`try_command_on_node -v 1 "$CTDB ip" | grep -v Public | egrep " 1$" | wc -l`
echo "Number of addresses on node 1 : $num"
[ "$num" != "0" ] && {
echo "BAD: node took over ip addresses"
exit 1
}
echo "OK. ip addresses were not taken over"