sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

Revert "ctdb-tests: Do not trigger ctdb_test_error() from ctdb_init()"

Browse Source 
Fix missing Reviewed-by: tag.

This reverts commit 44e05ac8515be3220a334ae8001db83b06bec59f.

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:43:07 +10:00 committed by Martin Schwenke
parent e11526ad54
commit da654f9795
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -583,15 +583,9 @@ ctdb_init ()
{
ctdb_nodes_stop >/dev/null 2>&1 || :
if ! ctdb_nodes_start ; then
echo "Cluster start failed"
return 1
fi
ctdb_nodes_start || ctdb_test_error "Cluster start failed"
if ! wait_until_ready 120 ; then
echo "Cluster didn't become ready"
return 1
fi
wait_until_ready 120 || ctdb_test_error "Cluster didn't become ready"
echo "Setting RerecoveryTimeout to 1"
onnode -pq all "$CTDB setvar RerecoveryTimeout 1"
@ -602,16 +596,13 @@ ctdb_init ()
if ! onnode -q all "$CTDB_TEST_WRAPPER _cluster_is_recovered" ; then
echo "Cluster has gone into recovery again, waiting..."
if ! wait_until 30/2 onnode -q all \
"$CTDB_TEST_WRAPPER _cluster_is_recovered" ; then
echo "Cluster did not come out of recovery"
return 1
fi
wait_until 30/2 onnode -q all \
"$CTDB_TEST_WRAPPER _cluster_is_recovered" || \
ctdb_test_error "Cluster did not come out of recovery"
fi
if ! onnode 0 "$CTDB_TEST_WRAPPER _cluster_is_healthy" ; then
echo "Cluster became UNHEALTHY again [$(date)]"
return 1
ctdb_test_error "Cluster became UNHEALTHY again [$(date)]"
fi
echo "Doing a sync..."