From a766136df459df33becd05726253b83d32993a94 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 6 Jul 2020 11:56:16 +1000 Subject: ctdb-tests: Do not trigger ctdb_test_error() from ctdb_init() The only caller calls ctdb_test_error() on failure and nesting this calls can be confusing. A future change will make this even more confusing. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/tests/scripts/integration.bash | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index 76d4d6c4b06..61372a44b60 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -583,9 +583,15 @@ ctdb_init () { ctdb_nodes_stop >/dev/null 2>&1 || : - ctdb_nodes_start || ctdb_test_error "Cluster start failed" + if ! ctdb_nodes_start ; then + echo "Cluster start failed" + return 1 + fi - wait_until_ready 120 || ctdb_test_error "Cluster didn't become ready" + if ! wait_until_ready 120 ; then + echo "Cluster didn't become ready" + return 1 + fi echo "Setting RerecoveryTimeout to 1" onnode -pq all "$CTDB setvar RerecoveryTimeout 1" @@ -596,13 +602,16 @@ ctdb_init () if ! onnode -q all "$CTDB_TEST_WRAPPER _cluster_is_recovered" ; then echo "Cluster has gone into recovery again, waiting..." - wait_until 30/2 onnode -q all \ - "$CTDB_TEST_WRAPPER _cluster_is_recovered" || \ - ctdb_test_error "Cluster did not come out of recovery" + 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 fi if ! onnode 0 "$CTDB_TEST_WRAPPER _cluster_is_healthy" ; then - ctdb_test_error "Cluster became UNHEALTHY again [$(date)]" + echo "Cluster became UNHEALTHY again [$(date)]" + return 1 fi echo "Doing a sync..." -- cgit v1.2.1