revert b=17839 commit

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 03dd4ba..ad8a8aa 100755 (executable)
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -424,6 +424,7 @@ if [ "$LARGE_SCALE" != "no" ]; then
         LARGE_SCALE="done"
 fi
 
+[ "$SLOW" = no ] && RECOVERY_MDS_SCALE="no"
 [ "$RECOVERY_MDS_SCALE" != "no" ] && skip_remmds recovery-mds-scale && RECOVERY_MDS_SCALE=no && MSKIPPED=1
 [ "$RECOVERY_MDS_SCALE" != "no" ] && skip_remost recovery-mds-scale && RECOVERY_MDS_SCALE=no && OSKIPPED=1
 if [ "$RECOVERY_MDS_SCALE" != "no" ]; then

diff --git a/lustre/tests/recovery-mds-scale.sh b/lustre/tests/recovery-mds-scale.sh
index fae3eba..8c47ee1 100644 (file)
--- a/lustre/tests/recovery-mds-scale.sh
+++ b/lustre/tests/recovery-mds-scale.sh
@@ -148,12 +148,7 @@ log "-----============= $0 starting =============-----"
 
 trap summary_and_cleanup EXIT INT
 
-if [ "$SLOW" = "no" ]; then
-    DURATION=${DURATION:-$((60 * 30))}
-else
-    DURATION=${DURATION:-$((60 * 60 * 24))}
-fi
-
+DURATION=${DURATION:-$((60*60*24))}
 ELAPSED=0
 NUM_FAILOVERS=0
 
@@ -177,12 +172,16 @@ fi
 START_TS=$(date +%s)
 CURRENT_TS=$START_TS
 
-if [ "$SLOW" = "no" ]; then
-    SERVER_FAILOVER_PERIOD=${SERVER_FAILOVER_PERIOD:-$((60 * 5))}
+if [ "$FLAVOR" == "MDS" ]; then
+    SERVER_FAILOVER_PERIOD=$MDS_FAILOVER_PERIOD
+    SERVERS=$MDTS
 else
-    SERVER_FAILOVER_PERIOD=${SERVER_FAILOVER_PERIOD:-$((60 * 10))} # 10 minutes
+    SERVER_FAILOVER_PERIOD=$OSS_FAILOVER_PERIOD
+    SERVERS=$OSTS
 fi
- 
+
+SERVER_FAILOVER_PERIOD=${SERVER_FAILOVER_PERIOD:-$((60 * 10))} # 10 minutes
+
 MINSLEEP=${MINSLEEP:-120}
 REQFAIL_PERCENT=${REQFAIL_PERCENT:-3}  # bug17839 comment 62
 REQFAIL=${REQFAIL:-$(( DURATION / SERVER_FAILOVER_PERIOD * REQFAIL_PERCENT / 100))}