Revert "b=22423 Reconnects are not throttled"

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

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index f4d8546..055302d 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1374,21 +1374,19 @@ test_35b() { # bug 18674
                at_max_set 0 mds client
        fi
 
                at_max_set 0 mds client
        fi
 

-       mkdir -p $MOUNT/$tdir
+       mkdir -p $MOUNT/testdir
+       touch $MOUNT/testdir/test

 
        log "Injecting EBUSY on MDS"
        # Setting OBD_FAIL_MDS_RESEND=0x136
        do_facet mds "$LCTL set_param fail_loc=0x80000136" || return 2
 
 
        log "Injecting EBUSY on MDS"
        # Setting OBD_FAIL_MDS_RESEND=0x136
        do_facet mds "$LCTL set_param fail_loc=0x80000136" || return 2
 

-       $LCTL set_param mdc.${FSNAME}*.stats=clear
-
-       log "Creating a test file and stat it"
-       touch $MOUNT/$tdir/$tfile
-       stat $MOUNT/$tdir/$tfile
+       log "Stat on a test file"
+       stat $MOUNT/testdir/test

 
        log "Stop injecting EBUSY on MDS"
        do_facet mds "$LCTL set_param fail_loc=0" || return 3
 
        log "Stop injecting EBUSY on MDS"
        do_facet mds "$LCTL set_param fail_loc=0" || return 3

-       rm -f $MOUNT/$tdir/$tfile
+       rm -f $MOUNT/testdir/test

 
        log "done"
        # restore adaptive timeout
 
        log "done"
        # restore adaptive timeout


@@ -1396,8 +1394,6 @@ test_35b() { # bug 18674
 
        $LCTL dk $TMP/lustre-log-$TESTNAME.log
 
 
        $LCTL dk $TMP/lustre-log-$TESTNAME.log
 

-       CONNCNT=`$LCTL get_param mdc.${FSNAME}*.stats | awk '/mds_connect/{print $2}'`
-

        # retrieve from the log if the client has ever tried to
        # contact the fake server after the loss of connection
        FAILCONN=`awk "BEGIN {ret = 0;}
        # retrieve from the log if the client has ever tried to
        # contact the fake server after the loss of connection
        FAILCONN=`awk "BEGIN {ret = 0;}


@@ -1417,12 +1413,6 @@ test_35b() { # bug 18674
                log "ERROR: The client tried to reconnect to the failover server while the primary was busy" && \
                return 5
 
                log "ERROR: The client tried to reconnect to the failover server while the primary was busy" && \
                return 5
 

-       # When OBD_FAIL_MDS_RESEND is hit, we sleep for 2 * obd_timeout
-        # Reconnects are supposed to be rate limited to one every 5s
-       [ $CONNCNT -gt $((2 * $TIMEOUT / 5 + 1)) ] && \
-               log "ERROR: Too many reconnects $CONNCNT" && \
-               return 6
-

         cleanup
        # remove nid settings
        writeconf
         cleanup
        # remove nid settings
        writeconf