Branch b1_8_gate

b=17748
i=grev
i=adilger

sanityN test issue is fixed

diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 6c45672..6836446 100644 (file)
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -690,12 +690,12 @@ test_32b() { # bug 11270
 run_test 32b "lockless i/o"
 
 test_33() { #16129
+        local OPER
+        local lock_in
+        local lock_out
         for OPER in notimeout timeout ; do
                 rm $DIR1/$tfile 2>/dev/null
-                lock_in=0;
-                for f in `lctl get_param -n ldlm/namespaces/*/lock_timeouts`; do
-                        lock_in=$(($lock_in + $f))
-                done
+                lock_in=$(do_nodes $(osts_nodes) "lctl get_param -n ldlm.namespaces.filter-*.lock_timeouts" | calc_sum)
                 if [ $OPER == "timeout" ] ; then
                         for j in `seq $OSTCOUNT`; do
                                 #define OBD_FAIL_PTLRPC_HPREQ_TIMEOUT    0x511
@@ -718,10 +718,7 @@ test_33() { #16129
                 dd of=/dev/null if=$DIR2/$tfile > /dev/null 2>&1
                 # wait for a lock timeout
                 sleep 4
-                lock_out=0
-                for f in `lctl get_param -n ldlm/namespaces/*/lock_timeouts`; do
-                        lock_out=$(($lock_out + $f))
-                done
+                lock_out=$(do_nodes $(osts_nodes) "lctl get_param -n ldlm.namespaces.filter-*.lock_timeouts" | calc_sum)
                 if [ $OPER == "timeout" ] ; then 
                         if [ $lock_in == $lock_out ]; then
                                 error "no lock timeout happened"