summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xctdb/tests/simple/51_ctdb_bench.sh7
-rw-r--r--ctdb/tests/src/ctdb_bench.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/ctdb/tests/simple/51_ctdb_bench.sh b/ctdb/tests/simple/51_ctdb_bench.sh
index b5072c34f9..6caae055aa 100755
--- a/ctdb/tests/simple/51_ctdb_bench.sh
+++ b/ctdb/tests/simple/51_ctdb_bench.sh
@@ -83,10 +83,11 @@ fi
perc_diff=$(( ($positive - $negative) * 100 / $positive ))
perc_diff=${perc_diff#-}
-if [ $perc_diff -le 1 ] ; then
- echo "OK: percentage difference between +ive and -ive ($perc_diff%) <= 1%"
+check_percent=2
+if [ $perc_diff -le $check_percent ] ; then
+ echo "OK: percentage difference between +ive and -ive ($perc_diff%) <= $check_percent%"
else
- echo "BAD: percentage difference between +ive and -ive ($perc_diff%) > 1%"
+ echo "BAD: percentage difference between +ive and -ive ($perc_diff%) > $check_percent%"
exit 1
fi
diff --git a/ctdb/tests/src/ctdb_bench.c b/ctdb/tests/src/ctdb_bench.c
index 61bac49156..52e5b509a0 100644
--- a/ctdb/tests/src/ctdb_bench.c
+++ b/ctdb/tests/src/ctdb_bench.c
@@ -161,7 +161,7 @@ static void bench_ring(struct ctdb_context *ctdb, struct event_context *ev)
start_timer();
while (end_timer() < timelimit) {
- if (pnn == 0 && msg_count % 10000 == 0) {
+ if (pnn == 0 && msg_count % 10000 == 0 && end_timer() > 0) {
printf("Ring: %.2f msgs/sec (+ve=%d -ve=%d)\r",
msg_count/end_timer(), msg_plus, msg_minus);
fflush(stdout);