sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

ctdb-tests: Clean up and rename simple fetch_ring test

Browse Source 
* Rename to clarify purpose of test

* Simplify test info to avoid unnecessary bit-rot

* Have fetch_ring print PNN for clearer output and update patterns in
  test script to suit

* Simplify sanity checking pattern due to less data because of
  --interactive/-i option

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 c10dcc7b91df62f740a4789763234f8bb2f0a27f)
This commit is contained in:
Martin Schwenke 2016-08-02 14:42:45 +10:00 committed by Stefan Metzmacher
parent 10e66ef467
commit 21cbbb19c2
3 changed files with 48 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ctdb/tests/simple/52_ctdb_fetch.sh
View File

@ -1,64 +0,0 @@
#!/bin/bash
test_info()
{
cat <<EOF
Run the ctdb_fetch test and sanity check the output.
This doesn't test for performance regressions or similarly anything
useful. Only vague sanity checking of results is done.
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 ctdb_fetch on all nodes with default options.
3. Ensure that the number of +ve and -ive messages are within 1% of
each other.
4. Ensure that the number of messages per second is greater than 10.
Expected results:
* ctdb_fetch runs without error and prints reasonable results.
EOF
}
. "${TEST_SCRIPTS_DIR}/integration.bash"
ctdb_test_init "$@"
set -e
cluster_is_healthy
try_command_on_node 0 "$CTDB listnodes"
num_nodes=$(echo "$out" | wc -l)
echo "Running ctdb_fetch on all $num_nodes nodes."
try_command_on_node -v -p all $CTDB_TEST_WRAPPER $VALGRIND fetch_ring -n $num_nodes
pat='^(Fetch: [[:digit:]]+(\.[[:digit:]]+)? msgs/sec[[:space:]]?|msg_count=[[:digit:]]+ on node [[:digit:]]|Fetching final record|DATA:|Test data|Waiting for cluster[[:space:]]?|.*: Reqid wrap!|Sleeping for [[:digit:]]+ seconds|)+$'
sanity_check_output 1 "$pat" "$out"
# Filter out the performance figures:
out_fetch=$(echo "$out" | egrep '^(Fetch: .*)+$')
# Get the last line of output.
while read line ; do
prev=$line
done <<<"$out_fetch"
# $prev should look like this:
# Fetch: 10670.93 msgs/sec
stuff="${prev##*Fetch: }"
mps="${stuff% msgs/sec*}"
if [ ${mps%.*} -ge 10 ] ; then
echo "OK: $mps msgs/sec >= 10 msgs/sec"
else
echo "BAD: $mps msgs/sec < 10 msgs/sec"
exit 1
fi

46
ctdb/tests/simple/52_fetch_ring.sh Executable file
View File

@ -0,0 +1,46 @@
#!/bin/bash
test_info()
{
cat <<EOF
Run the fetch_ring test and sanity check the output.
Prerequisites:
* An active CTDB cluster with at least 2 active nodes.
EOF
}
. "${TEST_SCRIPTS_DIR}/integration.bash"
ctdb_test_init "$@"
set -e
cluster_is_healthy
try_command_on_node 0 "$CTDB listnodes"
num_nodes=$(echo "$out" | wc -l)
echo "Running fetch_ring on all $num_nodes nodes."
try_command_on_node -v -p all $CTDB_TEST_WRAPPER $VALGRIND fetch_ring -n $num_nodes
pat='^(Waiting for cluster|Fetch\[[[:digit:]]+\]: [[:digit:]]+(\.[[:digit:]]+)? msgs/sec)$'
sanity_check_output 1 "$pat" "$out"
# Get the last line of output.
while read line ; do
prev=$line
done <<<"$out"
# $prev should look like this:
# Fetch[1]: 10670.93 msgs/sec
stuff="${prev##*Fetch\[*\]: }"
mps="${stuff% msgs/sec*}"
if [ ${mps%.*} -ge 10 ] ; then
echo "OK: $mps msgs/sec >= 10 msgs/sec"
else
echo "BAD: $mps msgs/sec < 10 msgs/sec"
exit 1
fi

3
ctdb/tests/src/fetch_ring.c
View File

@ -270,7 +270,8 @@ static void fetch_ring_finish(struct tevent_req *subreq)
t = timeval_elapsed(&state->start_time);
printf("Fetch: %.2f msgs/sec\n", state->msg_count / t);
printf("Fetch[%u]: %.2f msgs/sec\n", ctdb_client_pnn(state->client),
state->msg_count / t);
subreq = ctdb_fetch_lock_send(state, state->ev, state->client,
state->ctdb_db, state->key, false);