fix for

b=15711
i=Tappro
set mds${num}failover_HOST properly

fix for
b=15255
i=Adilger
umount $MOUNT2 only if it is set

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index b9445d8..94bbafb 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -975,7 +975,7 @@ stopall() {
 
     if [ -n "$CLIENTS" ]; then
             zconf_umount_clients $CLIENTS $MOUNT "$*" || true
 
     if [ -n "$CLIENTS" ]; then
             zconf_umount_clients $CLIENTS $MOUNT "$*" || true

-            zconf_umount_clients $CLIENTS $MOUNT2 "$*" || true
+            [ -n "$MOUNT2" ] && zconf_umount_clients $CLIENTS $MOUNT2 "$*" || true

     fi
 
     [ "$CLIENTONLY" ] && return
     fi
 
     [ "$CLIENTONLY" ] && return


@@ -1108,8 +1108,9 @@ setupall() {
 
             # We started mds, now we should set failover variables properly.
             # Set mds${num}failover_HOST if it is not set (the default failnode).
 
             # We started mds, now we should set failover variables properly.
             # Set mds${num}failover_HOST if it is not set (the default failnode).

-            if [ -z "$mds${num}failover_HOST" ]; then
-                mds${num}failover_HOST=$(facet_host mds$num)
+            local varname=mds${num}failover_HOST
+            if [ -z "${!varname}" ]; then
+                eval mds${num}failover_HOST=$(facet_host mds$num)

             fi
 
            if [ $IDENTITY_UPCALL != "default" ]; then
             fi
 
            if [ $IDENTITY_UPCALL != "default" ]; then