X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre-iokit%2Fobdfilter-survey%2Fobdfilter-survey;h=c4980c980287622929b4c7501dcece63eb2794a4;hb=784bbd385b22b6578bb98691f3bb130a1ed84dc6;hp=896808e00268324c6b9fcffdbebb2a5ef9e49e04;hpb=2e562ab4ad1c9b73c99ec7473a997a0e57ac8392;p=fs%2Flustre-release.git

diff --git a/lustre-iokit/obdfilter-survey/obdfilter-survey b/lustre-iokit/obdfilter-survey/obdfilter-survey
index 896808e..c4980c9 100755
--- a/lustre-iokit/obdfilter-survey/obdfilter-survey
+++ b/lustre-iokit/obdfilter-survey/obdfilter-survey
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+set -e
 ######################################################################
 # customize per survey
 
@@ -48,6 +48,11 @@ rslt=${rslt:-"$rslt_loc/obdfilter_survey_`date +%F@%R`_`uname -n`"}
 # Set this true to check file contents
 verify=${verify:-0}
 
+# test targets
+targets=${targets:-""}
+# test case
+case=${case:-"disk"}
+
 # total size (MBytes) per obd instance
 # large enough to avoid cache effects 
 # and to make test startup/shutdown overhead insignificant
@@ -56,6 +61,7 @@ size=${size:-16384}
 # record size (KBytes) ( 7168 max)
 rszlo=${rszlo:-1024}
 rszhi=${rszhi:-1024}
+rszmax=${rszmax:-4096}
 
 # number of objects per OST
 nobjlo=${nobjlo:-1}
@@ -170,6 +176,15 @@ testname2type () {
     esac
 }
 
+# for "echo_client + obdfilter" case, "prep + commit" mode should be used
+# for "echo_client + osc" case, "BRW" mode should be used
+testcase2mode() {
+    case $case in
+    disk) echo "p$1";;
+    *)    echo "g";;
+    esac
+}
+
 print_summary () {
     if [ "$1" = "-n" ]; then
         minusn=$1; shift
@@ -180,12 +195,36 @@ print_summary () {
     echo $minusn "$*"
 }
 
+version_code() {
+	# split arguments like "2.3.61" into "2", "3", "61"
+	eval set -- $(tr "[:punct:]" " " <<< $*)
+	echo -n "$((($1 << 16) | ($2 << 8) | $3))"
+}
+
+get_lustre_version() {
+	local host=${1:-${unique_hosts[0]}}
+	remote_shell $host $lctl get_param -n version |
+		awk '/^lustre:/ {print $2}'
+}
+
+# Check whether the record size (KBytes) exceeds the maximum bulk I/O RPC size
+# or not.
+check_record_size() {
+	[ $(version_code $(get_lustre_version)) -lt $(version_code 2.3.61) ] &&
+		rszmax=1024
+
+	if [ "$rszhi" -gt "$rszmax" ]; then
+		echo "Test disk case support maximum ${rszmax}KB IO data" \
+		     "(rszhi=$rszhi is too big), please use a smaller value."
+		return 1
+	fi
+	return 0
+}
+
 # Customisation variables
 #####################################################################
 # One can change variable values in this section as per requirements
 
-targets=${targets:-""}
-case=${case:-"disk"}
 if [ -n "$targets" ]; then
     declare -a ost_names
     declare -a client_names
@@ -273,11 +312,6 @@ for trgt in $targets; do
     ndevs=$((ndevs+1))
 done
 if [ $case == "disk" ]; then
-    if [ $rszhi -gt 1024 ]; then
-        echo "Test disk case support maximum 1024KB IO data" \
-             "(rszhi=$rszhi is too big) please use a smaller value."
-        exit 1
-    fi
     for ((i = 0; i < $ndevs; i++)); do
         ost_names[$i]=${client_names[$i]}
     done
@@ -370,6 +404,11 @@ fi
 # disable portals debug and get obdecho loaded on all relevant hosts
 unique_hosts=(`unique ${host_names[@]}`)
 load_obdechos
+
+if [ $case == "disk" ]; then
+	check_record_size || cleanup ${PIPESTATUS[0]}
+fi
+
 pidcount=0
 for host in ${unique_hosts[@]}; do
     host_vmstatf=${vmstatf}_${host}
@@ -468,7 +507,8 @@ for ((rsz = $rszlo; rsz <= $rszhi; rsz*=2)); do
 		    echo >> ${cmdsf}_${host} \
 		        "$lctl > $tmpfi 2>&1 \\
                          --threads $thr -$snap $devno \\
-			 test_brw $count `testname2type $test` q $pages ${thr_per_obj}t${first_obj} &"
+                         test_brw $count `testname2type $test` q $pages \\
+                         ${thr_per_obj}t${first_obj} `testcase2mode $pages` &"
                 done
                 pidcount=0
                 for host in ${unique_hosts[@]}; do