revert b=17839 commit

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index b21af68..912e184 100755 (executable)
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -432,6 +432,7 @@ if [ "$PERFORMANCE_SANITY" != "no" ]; then
         PERFORMANCE_SANITY="done"
 fi
 
         PERFORMANCE_SANITY="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
 [ "$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 4286999..7440ed5 100644 (file)
--- a/lustre/tests/recovery-mds-scale.sh
+++ b/lustre/tests/recovery-mds-scale.sh
@@ -152,12 +152,7 @@ log "-----============= $0 starting =============-----"
 
 trap summary_and_cleanup EXIT INT
 
 
 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
 
 ELAPSED=0
 NUM_FAILOVERS=0
 


@@ -181,12 +176,16 @@ fi
 START_TS=$(date +%s)
 CURRENT_TS=$START_TS
 
 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
 else

-    SERVER_FAILOVER_PERIOD=${SERVER_FAILOVER_PERIOD:-$((60 * 10))} # 10 minutes
+    SERVER_FAILOVER_PERIOD=$OSS_FAILOVER_PERIOD
+    SERVERS=$OSTS

 fi
 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))}
 MINSLEEP=${MINSLEEP:-120}
 REQFAIL_PERCENT=${REQFAIL_PERCENT:-3}  # bug17839 comment 62
 REQFAIL=${REQFAIL:-$(( DURATION / SERVER_FAILOVER_PERIOD * REQFAIL_PERCENT / 100))}