diff options
| author | Martin Schwenke <martin@meltin.net> | 2016-08-02 14:52:14 +1000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2016-08-10 11:24:35 +0200 |
| commit | 35f777c0154dec833e8f090cb27623af190919f4 (patch) | |
| tree | fb9b38aeea13431a811d90478055c3b113fe0860 | |
| parent | ea6a9764ebef6b60044a2370a94a4b84ced6775d (diff) | |
| download | samba-35f777c0154dec833e8f090cb27623af190919f4.tar.gz | |
ctdb-tests: Clean up and rename simple transaction_loop recovery test
* Rename to clarify purpose of test
* Simplify test info to avoid unnecessary bit-rot
* Restart after test since test does heavy database manipulation
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12109
Pair-programmed-with: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 8ce8e1d7f8c05158f0f5f4e673f3d9a40f94f00d)
| -rwxr-xr-x | ctdb/tests/simple/54_transaction_loop_recovery.sh (renamed from ctdb/tests/simple/54_ctdb_transaction_recovery.sh) | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/ctdb/tests/simple/54_ctdb_transaction_recovery.sh b/ctdb/tests/simple/54_transaction_loop_recovery.sh index 3918c336073..db70c1b90db 100755 --- a/ctdb/tests/simple/54_ctdb_transaction_recovery.sh +++ b/ctdb/tests/simple/54_transaction_loop_recovery.sh @@ -3,22 +3,11 @@ test_info() { cat <<EOF -Verify that the ctdb_transaction test succeeds. +Verify that the transaction_loop test succeeds with recoveries. Prerequisites: * An active CTDB cluster with at least 2 active nodes. - -Steps: - -1. Verify that the status on all of the ctdb nodes is 'OK'. -2. Run two copies of ctdb_transaction on each node with a 30 second - timeout. -3. Ensure that all ctdb_transaction processes complete successfully. - -Expected results: - -* ctdb_transaction runs without error. EOF } @@ -49,6 +38,8 @@ set -e cluster_is_healthy +ctdb_restart_when_done + try_command_on_node 0 "$CTDB attach transaction_loop.tdb persistent" try_command_on_node 0 "$CTDB wipedb transaction_loop.tdb" @@ -65,6 +56,5 @@ t="$CTDB_TEST_WRAPPER $VALGRIND transaction_loop \ echo "Starting recovery loop" recovery_loop_start -echo "Running ctdb_transaction on all $num_nodes nodes." +echo "Running transaction_loop on all $num_nodes nodes." try_command_on_node -v -p all "$t" - |