Some racy problems happened when sanity-quota.sh run on buffalo.

[fs/lustre-release.git] / lustre / tests / conf-sanity.sh

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 98d6c47..757d9cc 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1057,7 +1057,7 @@ test_32a() {
 
        $TUNEFS $TMP/$tdir/mds || error "tunefs failed"
        # nids are wrong, so client wont work, but server should start
-       start mds $TMP/$tdir/mds "-o loop" || return 3
+        start mds $TMP/$tdir/mds "-o loop,exclude=lustre-OST0000" || return 3
         local UUID=$(cat $LPROC/mds/lustre-MDT0000/uuid)
        echo MDS uuid $UUID
        [ "$UUID" == "mdsA_UUID" ] || error "UUID is wrong: $UUID" 
@@ -1079,14 +1079,22 @@ test_32a() {
        $LCTL conf_param lustre-MDT0000.failover.node=$NID || return 10
        echo "ok."
 
-       #With a new good MDT failover nid, we should be able to mount a client
-       #(but it cant talk to OST)
+       # With a new good MDT failover nid, we should be able to mount a client
+       # (but it cant talk to OST)
+        local OLDMOUNTOPT=$MOUNTOPT
+        MOUNTOPT="exclude=lustre-OST0000"
        mount_client $MOUNT
+        MOUNTOPT=$OLDMOUNTOPT
        set_and_check "cat $LPROC/mdc/*/max_rpcs_in_flight" "lustre-MDT0000.mdc.max_rpcs_in_flight" || return 11
 
        zconf_umount `hostname` $MOUNT -f
        cleanup_nocli
 
+        # mount a second time to make sure we didnt leave upgrade flag on
+        $TUNEFS --dryrun $TMP/$tdir/mds || error "tunefs failed"
+        start mds $TMP/$tdir/mds "-o loop,exclude=lustre-OST0000" || return 12
+        cleanup_nocli
+
        [ -d $TMP/$tdir ] && rm -rf $TMP/$tdir
 }
 run_test 32a "Upgrade from 1.4 (not live)"