In 51_ctdb_bench.sh now allows a 2% difference between positive and

negative.  ctdb_bench.c checks to ensure the timer has advanced from 0
before dividing.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/tests/simple/51_ctdb_bench.sh b/tests/simple/51_ctdb_bench.sh
index b5072c34f9ac9065adefd8b85b180cc8958d8a5d..6caae055aa82aa3a7143ba1b9cee12fc9b406b72 100755 (executable)
--- a/tests/simple/51_ctdb_bench.sh
+++ b/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/tests/src/ctdb_bench.c b/tests/src/ctdb_bench.c
index 61bac491566142d0e80208d67d9954e994c7e652..52e5b509a0b5437438b7b11065da86e3b23cdffd 100644 (file)
--- a/tests/src/ctdb_bench.c
+++ b/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);