b=17839

i=Brian
recovery-mds-scale for SLOW=no

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 83b2641..ff52b44 100755 (executable)
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -409,7 +409,6 @@ if [ "$PERFORMANCE_SANITY" != "no" ]; then
         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

diff --git a/lustre/tests/recovery-mds-scale.sh b/lustre/tests/recovery-mds-scale.sh
index 8c47ee1..ed33037 100644 (file)
--- a/lustre/tests/recovery-mds-scale.sh
+++ b/lustre/tests/recovery-mds-scale.sh
@@ -62,6 +62,20 @@ OSTS=$(comma_list $OSTS)
 ERRORS_OK=""    # No application failures should occur during this test.
 FLAVOR=${FLAVOR:-"MDS"}
 
+if [ "$FLAVOR" == "MDS" ]; then
+    SERVERS=$MDTS
+else
+    SERVERS=$OSTS
+fi
+ 
+if [ "$SLOW" = "no" ]; then
+    DURATION=${DURATION:-$((60 * 30))}
+    SERVER_FAILOVER_PERIOD=${SERVER_FAILOVER_PERIOD:-$((60 * 5))}
+else
+    DURATION=${DURATION:-$((60 * 60 * 24))}
+    SERVER_FAILOVER_PERIOD=${SERVER_FAILOVER_PERIOD:-$((60 * 10))} # 10 minutes
+fi
+
 rm -f $END_RUN_FILE
 
 vmstatLOG=${TESTSUITELOG}_$(basename $0 .sh).vmstat
@@ -148,7 +162,6 @@ log "-----============= $0 starting =============-----"
 
 trap summary_and_cleanup EXIT INT
 
-DURATION=${DURATION:-$((60*60*24))}
 ELAPSED=0
 NUM_FAILOVERS=0
 
@@ -172,16 +185,6 @@ fi
 START_TS=$(date +%s)
 CURRENT_TS=$START_TS
 
-if [ "$FLAVOR" == "MDS" ]; then
-    SERVER_FAILOVER_PERIOD=$MDS_FAILOVER_PERIOD
-    SERVERS=$MDTS
-else
-    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))}
@@ -209,7 +212,7 @@ while [ $ELAPSED -lt $DURATION -a ! -e $END_RUN_FILE ]; do
         exit 4
     fi
 
-    log "Starting failover on $SERVERNODE"
+    log "Starting failover on $SERVERFACET"
 
     facet_failover "$SERVERFACET" || exit 1