sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

ctdb-tests: No longer retry starting the cluster

Browse Source 
Retrying like this hides bugs.  The cluster should come up first time,
every time.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2019-10-29 15:11:31 +11:00 committed by Amitay Isaacs
parent bf47bc18bb
commit 3b5ed00054
1 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ctdb/tests/scripts/integration.bash
View File

@ -568,26 +568,15 @@ wait_until_node_has_no_ips ()
ctdb_init ()
{
local i
for i in $(seq 1 5) ; do
ctdb_stop_all >/dev/null 2>&1 || :
ctdb_start_all || {
echo "Start failed. Trying again in a few seconds..."
sleep_for 5
continue
}
wait_until_ready || {
echo "Cluster didn't become ready. Restarting..."
continue
}
ctdb_start_all || ctdb_test_error "Cluster start failed"
wait_until_ready || ctdb_test_error "Cluster didn't become ready"
echo "Setting RerecoveryTimeout to 1"
onnode -pq all "$CTDB setvar RerecoveryTimeout 1"
# In recent versions of CTDB, forcing a recovery like this
# blocks until the recovery is complete. Hopefully this will
# help the cluster to stabilise before a subsequent test.
echo "Forcing a recovery..."
onnode -q 0 $CTDB recover
sleep_for 2
@ -597,14 +586,8 @@ ctdb_init ()
wait_until 30/2 onnode -q any $CTDB_TEST_WRAPPER _cluster_is_recovered
fi
# Cluster is still healthy. Good, we're done!
if ! onnode 0 $CTDB_TEST_WRAPPER _cluster_is_healthy ; then
echo "Cluster became UNHEALTHY again [$(date)]"
onnode -p all ctdb status -X 2>&1
onnode -p all ctdb scriptstatus 2>&1
echo "Restarting..."
continue
ctdb_test_error "Cluster became UNHEALTHY again [$(date)]"
fi
echo "Doing a sync..."
@ -612,15 +595,6 @@ ctdb_init ()
echo "ctdb is ready"
return 0
done
echo "Cluster UNHEALTHY... too many attempts..."
onnode -p all ctdb status -X 2>&1
onnode -p all ctdb scriptstatus 2>&1
# Try to make the calling test fail
status=1
return 1
}
ctdb_base_show ()