b=14471

i=Adilger
replace lustre proc by lctl [set|get]_param

lustre/tests/lfscktest.sh

@@ -45,7 +45,7 @@ if [ "$WAS_MOUNTED" ]; then
 fi
 
 get_mnt_devs() {
-	DEVS=`cat /proc/fs/lustre/$1/*/mntdev`
+	DEVS=`lctl get_param -n $1.*.mntdev`
 	for DEV in $DEVS; do
 		case $DEV in
 		*loop*) losetup $DEV | sed -e "s/.*(//" -e "s/).*//" ;;

lustre/tests/replay-ost-single.sh

@@ -118,7 +118,7 @@ test_5() {
 run_test 5 "Fail OST during iozone"
 
 kbytesfree() {
-   lctl get_param -n osc.*-osc-*.kbytesfree | awk '{total+=$1} END {print total}'
+   calc_osc_kbytes kbytesfree
 }
 
 test_6() {

lustre/tests/test-framework.sh

@@ -1947,6 +1947,14 @@ calc_llite_stats() {
         echo $res
 }
 
+calc_sum () {
+        awk 'BEGIN {s = 0}; {s += $1}; END {print s}'
+}
+
+calc_osc_kbytes () {
+        $LCTL get_param -n osc.*[oO][sS][cC][-_]*.$1 | calc_sum
+}
+
 # save_lustre_params(node, parameter_mask)
 # generate a stream of formatted strings (<node> <param name>=<param value>)
 save_lustre_params() {