From d58b0b014412bb840c8e8f782f669ee7ab5d6b5d Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Wed, 15 Oct 2008 16:13:21 +0000
Subject: [PATCH] b=14471 i=Adilger replace lustre proc by lctl [set|get]_param

---
 lustre/tests/lfscktest.sh         | 2 +-
 lustre/tests/replay-ost-single.sh | 2 +-
 lustre/tests/test-framework.sh    | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lustre/tests/lfscktest.sh b/lustre/tests/lfscktest.sh
index b10190a..d7691f6 100755
--- a/lustre/tests/lfscktest.sh
+++ b/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/).*//" ;;
diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index cdcd690..087aef8 100755
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -118,7 +118,7 @@ test_5() {
 run_test 5 "Fail OST during iozone"
 
 kbytesfree() {
-   awk '{total+=$1} END {print total}' /proc/fs/lustre/osc/*-osc-*/kbytesfree
+   calc_osc_kbytes kbytesfree
 }
 
 test_6() {
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 627952ca..14e3eab 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1713,6 +1713,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() {
-- 
1.8.3.1