From: Jian Yu <jian.yu@intel.com>
Date: Wed, 29 Oct 2014 20:52:09 +0000 (-0700)
Subject: LU-5079 tests: decrease at_max value in replay-vbr test_7_cycle
X-Git-Tag: 2.6.90~31
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=5c99a57116e389ec455e0789f0ace850dd7763fd

LU-5079 tests: decrease at_max value in replay-vbr test_7_cycle

After commit 1d88909 (http://review.whamcloud.com/11213) was landed,
replay-vbr test 7* took long time to run due to more sleep time in
ptlrpc_set_wait(). This patch speeds up the tests by decreasing the
at_max value in test_7_cycle().

Test-Parameters: alwaysuploadlogs \
envdefinitions=SLOW=yes,ENABLE_QUOTA=yes \
mdtfilesystemtype=ldiskfs mdsfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs \
clientdistro=el6 ossdistro=el6 mdsdistro=el6 \
mdtcount=1 mdssizegb=2 ostcount=7 ostsizegb=2 \
testlist=replay-vbr,replay-vbr

Signed-off-by: Jian Yu <jian.yu@intel.com>
Change-Id: If24443955290b091fd22905dfb74b0d6a6d1b4e8
Reviewed-on: http://review.whamcloud.com/12490
Tested-by: Jenkins
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Mike Pershin <mike.pershin@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/replay-vbr.sh b/lustre/tests/replay-vbr.sh
index 4018a9b..f633a0d 100644
--- a/lustre/tests/replay-vbr.sh
+++ b/lustre/tests/replay-vbr.sh
@@ -711,6 +711,12 @@ test_7_cycle() {
     do_facet $SINGLEMDS "$LCTL set_param mdd.${!var}.sync_permission=0"
     do_facet $SINGLEMDS "$LCTL set_param mdt.${!var}.commit_on_sharing=0"
 
+	local at_max_saved=0
+	if at_is_enabled; then
+		at_max_saved=$(at_max_get $SINGLEMDS)
+		at_max_set $TIMEOUT mds client
+	fi
+
     do_node $CLIENT1 mkdir -p $DIR/$tdir
     replay_barrier $SINGLEMDS
     # first operation
@@ -727,11 +733,12 @@ test_7_cycle() {
     # should fail as conflict expected
     client_evicted $CLIENT1 || rc=1
 
-    wait_recovery_complete $SINGLEMDS
+	wait_recovery_complete $SINGLEMDS
 	wait_mds_ost_sync || error "wait_mds_ost_sync failed"
 
-    rm -rf $DIR/$tdir
-    return $rc
+	[[ $at_max_saved -eq 0 ]] || at_max_set $at_max_saved mds client
+	rm -rf $DIR/$tdir
+	return $rc
 }
 
 test_7a() {