From: wang di <di.wang@intel.com>
Date: Thu, 17 Jul 2014 10:50:03 +0000 (-0700)
Subject: LU-4024 tests: cleanup file system before DNE tests.
X-Git-Tag: 2.5.0~8
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e789a35352c78efca8c6ce0d7a4d0a84429072ce

LU-4024 tests: cleanup file system before DNE tests.

Cleanup filesystem before DNE tests in conf-sanity.

Test-Parameters: mdtcount=2 mdscount=2
Signed-off-by: wang di <di.wang@intel.com>
Change-Id: I02c025f1ba1af3983f70694ccf99bfb82645cf14
Reviewed-on: http://review.whamcloud.com/7801
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 4f6dcda..251b977 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -3893,6 +3893,8 @@ test_69() {
 	touch $DIR/$tdir/$tfile-last || error "create file after reformat"
 	local idx=$($LFS getstripe -c $DIR/$tdir/$tfile-last)
 	[ $idx -ne 0 ] && error "$DIR/$tdir/$tfile-last on $idx not 0" || true
+
+	cleanup
 }
 run_test 68 "replace an OST with the same index"
 
@@ -3900,6 +3902,8 @@ test_70a() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 	local MDTIDX=1
 
+	cleanup
+
 	start_mdt 1 || error "MDT0 start fail"
 
 	start_ost || error "OST0 start fail"