From 5bf53789ffbff195e8f06266111fac095301519b Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Wed, 3 Aug 2016 00:20:35 -0700 Subject: [PATCH] LU-8474 tests: stop MGS before setup_noconfig in conf-sanity.sh In conf-sanity.sh, some sub-tests will leave MGS mounted under separate MGT and MDT configuration, which will cause setup_noconfig() fail. This patch fixes the issue by stopping MGS before running setup_noconfig(). Test-Parameters: trivial combinedmdsmgs=false envdefinitions=ONLY=55 testlist=conf-sanity Test-Parameters: trivial envdefinitions=ONLY=55 testlist=conf-sanity Signed-off-by: Jian Yu Change-Id: I53f5549c392d300a2c76bbc4ce68e9a8198ba559 Reviewed-on: http://review.whamcloud.com/21653 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Parinay Kondekar Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 78bbc2f..c64ebab 100755 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -4048,6 +4048,10 @@ test_55() { for i in 1023 2048 do + if ! combined_mgs_mds; then + stop_mgs || error "stopping MGS service failed" + format_mgs || error "formatting MGT failed" + fi add mds1 $(mkfs_opts mds1 ${mdsdev}) --reformat $mdsdev \ $mdsvdev || exit 10 add ost1 $(mkfs_opts ost1 $(ostdevname 1)) --index=$i \ @@ -4144,6 +4148,7 @@ count_osts() { } test_58() { # bug 22658 + combined_mgs_mds || stop_mgs || error "stopping MGS service failed" setup_noconfig mkdir $DIR/$tdir || error "mkdir $DIR/$tdir failed" createmany -o $DIR/$tdir/$tfile-%d 100 @@ -4247,6 +4252,7 @@ test_61() { # LU-80 done fi + combined_mgs_mds || stop_mgs || error "stopping MGS service failed" setup_noconfig || error "setting up the filesystem failed" client_up || error "starting client failed" -- 1.8.3.1