LU-746 test: obdfilter-survey FAIL hndls expected >8, have 2

obdfilter-survey.sh checks jbd proc stats after survey, but it
doesn't take obd cleanup time into account, so the stats collected
may not reflect the data of test. To fix this, save run time of
survey test, and collect stats of (run_time/4) ago.

Signed-off-by: Lai Siyao <laisiyao@whamcloud.com>
Change-Id: I597a6279353c203b50b1c2b17543bd34d86d8806
Reviewed-on: http://review.whamcloud.com/1645
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Liang Zhen <liang@whamcloud.com>
Reviewed-by: Johann Lombardi <johann@whamcloud.com>

diff --git a/lustre/tests/obdfilter-survey.sh b/lustre/tests/obdfilter-survey.sh
index 42a6c0f..30ac28d 100644 (file)
--- a/lustre/tests/obdfilter-survey.sh
+++ b/lustre/tests/obdfilter-survey.sh
@@ -103,11 +103,14 @@ print_jbd () {
 check_jbd_values () {
        local facet=$1
        local thrhi=$2
+       local rtime=$3
 
        # last two lines from history
        # $4: run >= 5000
        # $8: hndls >= thrhi * 2
-       local hist=("$(print_jbd history $facet | tail -3 | head -2)")
+       # display history of rtime/4 before, in case obd cleanup consumes time
+       local tlines=$((rtime / 5 / 4 + 1))
+       local hist=("$(print_jbd history $facet | tail -$tlines | head -1)")
        echo "$hist"
        local run=($(echo "${hist[*]}" | awk '{print $4}'))
        local hndls=($(echo "${hist[*]}" | awk '{print $8}'))
@@ -125,10 +128,11 @@ check_jbd_values () {
 check_jbd_values_facets () {
        local facets=$1
        local thrhi=$2
+       local rtime=$3
        local facet
        local rc=0
        for facet in  ${facets//,/ }; do
-               check_jbd_values $facet $thrhi || rc=$((rc+$?))
+               check_jbd_values $facet $thrhi $rtime || rc=$((rc+$?))
        done
        return $rc
 }
@@ -141,9 +145,14 @@ test_1b () {
        save_lustre_params $(comma_list $(osts_nodes)) "obdfilter.${FSNAME}-*.sync_journal" >$param_file
        do_nodesv $(comma_list $(osts_nodes)) lctl set_param obdfilter.${FSNAME}-*.sync_journal=0
 
+       local stime=$(date +%s)
        thrlo=4 nobjhi=1 thrhi=4 obdflter_survey_run disk
+       local etime=$(date +%s)
+       # run time of obd survey
+       local rtime=$((etime - stime))
 
-       check_jbd_values_facets $(get_facets OST) 4 || rc=$((rc+$?))
+       echo "obd survey finished in $rtime seconds"
+       check_jbd_values_facets $(get_facets OST) 4 $rtime || rc=$((rc+$?))
 
        restore_lustre_params < $param_file
 
@@ -165,9 +174,13 @@ test_2b () {
        save_lustre_params $(comma_list $(osts_nodes)) "obdfilter.${FSNAME}-*.sync_journal" >$param_file
        do_nodesv $(comma_list $(osts_nodes)) lctl set_param obdfilter.${FSNAME}-*.sync_journal=0
 
+       local stime=$(date +%s)
        thrlo=4 nobjhi=1 thrhi=4 obdflter_survey_run netdisk
+       local etime=$(date +%s)
+       local rtime=$((etime - stime))
 
-       check_jbd_values_facets $(get_facets OST) 4 || rc=$((rc+$?))
+       echo "obd survey finished in $rtime seconds"
+       check_jbd_values_facets $(get_facets OST) 4 $rtime || rc=$((rc+$?))
 
        restore_lustre_params < $param_file