diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-05-28 11:26:17 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-05-28 14:24:16 +1000 |
| commit | 529db4d52c36b33e923654c1051017eac90fce38 (patch) | |
| tree | 9fff4b8f2e9f9c095df736737e5a41cf0b967684 /ctdb/tests/scripts/integration.bash | |
| parent | 7dca4420572ce43c6ca5a95c1eaa4d71c6a65198 (diff) | |
tests/integration: Improve debug output for unhealthy cluster after restart
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 25a6fd784cde96f3d20a79f70b5589b5c4aca675)
Diffstat (limited to 'ctdb/tests/scripts/integration.bash')
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index 7d77139110..45e0b99e87 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -740,8 +740,6 @@ restart_ctdb () continue } - local debug_out=$(onnode -p all ctdb status -Y 2>&1; onnode -p all ctdb scriptstatus 2>&1) - echo "Setting RerecoveryTimeout to 1" onnode -pq all "$CTDB setvar RerecoveryTimeout 1" @@ -756,7 +754,10 @@ restart_ctdb () # Cluster is still healthy. Good, we're done! if ! onnode 0 $CTDB_TEST_WRAPPER _cluster_is_healthy ; then - echo "Cluster become UNHEALTHY again. Restarting..." + echo "Cluster became UNHEALTHY again [$(date)]" + onnode -p all ctdb status -Y 2>&1 + onnode -p all ctdb scriptstatus 2>&1 + echo "Restarting..." continue fi @@ -768,7 +769,9 @@ restart_ctdb () done echo "Cluster UNHEALTHY... too many attempts..." - echo "$debug_out" + onnode -p all ctdb status -Y 2>&1 + onnode -p all ctdb scriptstatus 2>&1 + # Try to make the calling test fail status=1 return 1 |