b=18696

i=Tappro
zconf_umount_clients fn remote command fix;

diff --git a/lustre/tests/recovery-double-scale.sh b/lustre/tests/recovery-double-scale.sh
index e2b5fb3..c8a4ada 100644 (file)
--- a/lustre/tests/recovery-double-scale.sh
+++ b/lustre/tests/recovery-double-scale.sh
@@ -72,8 +72,10 @@ reboot_recover_node () {
        clients) for c in ${item//,/ }; do
                       shutdown_client $c
                       boot_node $c
+                      echo "Reintegrating $c"
+                      zconf_mount $c $MOUNT || return $?
                  done
-                 start_client_loads $list || return $?
+                 start_client_loads $item || return $?
                  ;;
        * )      error "reboot_recover_node: nodetype=$nodetype. Must be one of 'MDS', 'OST', or 'clients'."
                 exit 1;;

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 3f7efc6..4cebc2f 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -457,7 +457,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
@@ -614,7 +614,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 
@@ -1956,7 +1956,7 @@ get_random_entry () {
 
     local nodes=($rnodes)
     local num=${#nodes[@]} 
-    local i=$((RANDOM * num  / 65536))
+    local i=$((RANDOM * num * 2 / 65536))
 
     echo ${nodes[i]}
 }