Whamcloud - gitweb
LU-7329 tests: increase sanity test_60b llog_test line count 70/17670/2
authorAndreas Dilger <andreas.dilger@intel.com>
Fri, 18 Dec 2015 08:29:25 +0000 (01:29 -0700)
committerOleg Drokin <oleg.drokin@intel.com>
Mon, 25 Jan 2016 01:57:41 +0000 (01:57 +0000)
With the increased number of tests in sanity test_60a due to the
landing of LU-6556, LU-6714, and LU-7329, the check test_60b that
detects CWARN/CERROR() rate limiting can be exceeded in some cases,
up to 81 llog_test lines in my testing.

Increase the maximum line count correspondingly.

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: I08e899f0faed10430aae0d90a54f43aad7500c1e
Reviewed-on: http://review.whamcloud.com/17670
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Faccini Bruno <bruno.faccini@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/tests/sanity.sh

index ac56464..5985805 100755 (executable)
@@ -5219,19 +5219,19 @@ run_test 60a "llog_test run from kernel module and test llog_reader =========="
 test_60b() { # bug 6411
        [ $PARALLEL == "yes" ] && skip "skip parallel run" && return
        dmesg > $DIR/$tfile
-       LLOG_COUNT=`dmesg | awk "/$TEST60_HEAD/{marker = 1; from_marker = 0;}
-                                /llog.test/ {
-                                        if (marker)
-                                                from_marker++
-                                        from_begin++
-                                }
-                                END {
-                                        if (marker)
-                                                print from_marker
-                                        else
-                                                print from_begin
-                                }"`
-       [[ $LLOG_COUNT -gt 50 ]] &&
+       LLOG_COUNT=$(dmesg | awk "/$TEST60_HEAD/ { marker = 1; from_marker = 0; }
+                               /llog.test/ {
+                                       if (marker)
+                                               from_marker++
+                                       from_begin++
+                               }
+                               END {
+                                       if (marker)
+                                               print from_marker
+                                       else
+                                               print from_begin
+                               }")
+       [[ $LLOG_COUNT -gt 100 ]] &&
                error "CDEBUG_LIMIT not limiting messages ($LLOG_COUNT)" || true
 }
 run_test 60b "limit repeated messages from CERROR/CWARN ========"