X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fobdfilter-survey.sh;h=e93fe2c58bb8b7dbb42f54d3d0e82c5de02a7f0c;hb=0bafbd7d8f652997d83b3cc2419894f48833f424;hp=d78f7b4322216512a820b5ff49ca9bf66030ecf6;hpb=dee5f24114531ec34fc56ce2826ada9e5690aabc;p=fs%2Flustre-release.git

diff --git a/lustre/tests/obdfilter-survey.sh b/lustre/tests/obdfilter-survey.sh
index d78f7b4..e93fe2c 100644
--- a/lustre/tests/obdfilter-survey.sh
+++ b/lustre/tests/obdfilter-survey.sh
@@ -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}'))
@@ -140,10 +140,12 @@ check_jbd_values_facets () {
 test_1b () {
 	local param_file=$TMP/$tfile-params
 
-	do_nodesv $(comma_list $(osts_nodes)) lctl get_param obdfilter.${FSNAME}-*.sync_journal
-
-	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
+	do_nodesv $(comma_list $(osts_nodes)) \
+		$LCTL get_param obdfilter.${FSNAME}-*.sync_journal
+	save_lustre_params $(get_facets OST) \
+		"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
@@ -175,10 +177,12 @@ run_test 2a "Stripe F/S over the Network"
 test_2b () {
 	local param_file=$TMP/$tfile-params
 
-	do_nodesv $(comma_list $(osts_nodes)) lctl get_param obdfilter.${FSNAME}-*.sync_journal
-
-	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
+	do_nodesv $(comma_list $(osts_nodes)) \
+		$LCTL get_param obdfilter.${FSNAME}-*.sync_journal
+	save_lustre_params $(get_facets OST) \
+		"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