X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=f72a59fab5b3f92283e421167e328927caf96518;hp=e081f8d22ac5392688daadfa2fad52247d34ec1d;hb=a7a2133bfab42eba077f1b8d5c991c651c8028c3;hpb=1829e654506c5b798eae5ef4a91948f1411513b4

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index e081f8d..f72a59f 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -610,7 +610,7 @@ echo Stopping client \\\$(hostname) client $mnt opts:$force
 lsof -t $mnt || need_kill=no
 if [ "x$force" != "x" -a "x\\\$need_kill" != "xno" ]; then
     pids=\\\$(lsof -t $mnt | sort -u);
-    if [ -n \\\$pids ]; then
+    if [ -n \\\"\\\$pids\\\" ]; then
              kill -9 \\\$pids
     fi
 fi
@@ -767,7 +767,7 @@ restart_client_loads () {
     for client in $clients; do
         check_client_load $client
         rc=${PIPESTATUS[0]}
-        if [ "$rc" != 0 -a "$expectedfail"]; then
+        if [ "$rc" != 0 -a "$expectedfail" ]; then
             start_client_load $client
             echo "Restarted client load: on $client. Checking ..."
             check_client_load $client 
@@ -1631,6 +1631,16 @@ exclude_items_from_list () {
     echo $(comma_list $list) 
 }
 
+# list, expand  are the comma separated lists
+expand_list () {
+    local list=${1//,/ }
+    local expand=${2//,/ }
+    local expanded=
+
+    expanded=$(for i in $list $expand; do echo $i; done | sort -u)
+    echo $(comma_list $expanded)
+}
+
 absolute_path() {
     (cd `dirname $1`; echo $PWD/`basename $1`)
 }
@@ -2236,7 +2246,7 @@ get_random_entry () {
 
     local nodes=($rnodes)
     local num=${#nodes[@]} 
-    local i=$((RANDOM * num  / 65536))
+    local i=$((RANDOM * num * 2 / 65536))
 
     echo ${nodes[i]}
 }