From: Jian Yu <Jian.Yu@Sun.COM>
Date: Fri, 3 Sep 2010 14:23:28 +0000 (+0800)
Subject: b=17748 fix sanityn test 33 to support multiple OSS nodes
X-Git-Tag: v1_8_4_53~34
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=69ccdad6dfca66434165c189c56d81eafac91f82;p=fs%2Flustre-release.git

b=17748 fix sanityn test 33 to support multiple OSS nodes

i=vitaly.fertman
i=grev
---

diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 922b4ff..5805076 100644
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -698,13 +698,22 @@ test_32b() { # bug 11270
 }
 run_test 32b "lockless i/o"
 
+get_ost_lock_timeouts() {
+    local nodes=${1:-$(comma_list $(osts_nodes))}
+
+    local locks=$(do_nodes $nodes \
+        "lctl get_param -n ldlm.namespaces.filter-*.lock_timeouts" | calc_sum)
+
+    echo $locks
+}
+
 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=$(do_nodes $(osts_nodes) "lctl get_param -n ldlm.namespaces.filter-*.lock_timeouts" | calc_sum)
+                lock_in=$(get_ost_lock_timeouts)
                 if [ $OPER == "timeout" ] ; then
                         for j in `seq $OSTCOUNT`; do
                                 #define OBD_FAIL_PTLRPC_HPREQ_TIMEOUT    0x511
@@ -725,7 +734,7 @@ test_33() { #16129
                 dd of=/dev/null if=$DIR2/$tfile > /dev/null 2>&1
                 # wait for a lock timeout
                 sleep 4
-                lock_out=$(do_nodes $(osts_nodes) "lctl get_param -n ldlm.namespaces.filter-*.lock_timeouts" | calc_sum)
+                lock_out=$(get_ost_lock_timeouts)
                 if [ $OPER == "timeout" ] ; then
                         if [ $lock_in == $lock_out ]; then
                                 error "no lock timeout happened"