LU-4665 tests: support specifying arbitrary OST indices

[fs/lustre-release.git] / lustre / tests / obdfilter-survey.sh

diff --git a/lustre/tests/obdfilter-survey.sh b/lustre/tests/obdfilter-survey.sh
index 5058fa7..cb54ca2 100644 (file)
--- a/lustre/tests/obdfilter-survey.sh
+++ b/lustre/tests/obdfilter-survey.sh
@@ -50,7 +50,7 @@ get_targets () {
                 for d in $devs; do
                         # if oss is local -- obdfilter-survey needs dev wo/ host
                         target=$d
-                        [[ $oss = `hostname` && "$1" == "netdisk" ]] || target=$nid:$target
+                        [[ $oss = `hostname` && "$1" == "disk" ]] || target=$nid:$target
                         targets="$targets $target"
                 done
         done
@@ -94,7 +94,7 @@ print_jbd () {
        local varsvc=${facet}_svc
        local dev=$(ldiskfs_canon "*.${!varsvc}.mntdev" $facet)
 
-       # ext4: /proc/fs/jbd2/sda1:8/history 
+       # ext4: /proc/fs/jbd2/sda1:8/history
        # ext3: /proc/fs/jbd/sdb1/history
 
        do_facet $facet cat /proc/fs/jbd*/${dev}*/$file
@@ -110,7 +110,7 @@ check_jbd_values () {
        # $8: hndls >= thrhi * 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)")
+       local hist=("$(print_jbd history $facet | tail -$tlines | head -n1)")
        echo "$hist"
        local run=($(echo "${hist[*]}" | awk '{print $4}'))
        local hndls=($(echo "${hist[*]}" | awk '{print $8}'))