X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fobdfilter-survey.sh;h=94a5182f620619b742b9060fc8afd8321f10717c;hb=ad21703f66c0d013d3cbd2d7f307715ef77864ff;hp=5058fa7246fe7152eeea8f5ff7aa3f40bd86f2c6;hpb=265d247c0199b3a914cd1f286ca99eaeb98f08cd;p=fs%2Flustre-release.git

diff --git a/lustre/tests/obdfilter-survey.sh b/lustre/tests/obdfilter-survey.sh
index 5058fa7..94a5182 100644
--- 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}'))
@@ -164,7 +164,7 @@ test_1b () {
 run_test 1b "Object Storage Targets survey, async journal"
 
 test_1c () {
-	nobjlo=1 nobjhi=1 thrlo=128 thrhi=128 rszlo=1024 rszhi=1024 size=8192\
+	nobjlo=1 nobjhi=1 thrlo=32 thrhi=32 rszlo=1024 rszhi=1024 size=8192\
 	obdflter_survey_run disk
 }
 run_test 1c "Object Storage Targets survey, big batch"