From aa3300dddd42bc0a1cc6eeeeeebf850c6349a7b6 Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Thu, 12 Jan 2017 08:56:22 -0600 Subject: [PATCH] LU-9014 test: handle separate MGS in conf-sanity test_72() In conf-sanity test_72() when using a separate MGS, add --replace to the mkfs options to prevent failures from already registered targets. Signed-off-by: John L. Hammond Change-Id: I06a266a8ca954c4b7c62fee3957145854d48dd38 Reviewed-on: https://review.whamcloud.com/24852 Tested-by: Jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Jian Yu --- lustre/tests/conf-sanity.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 6d95b78..4bf271cd 100755 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -5134,23 +5134,30 @@ test_72() { #LU-2634 local ostdev=$(ostdevname 1) local cmd="$E2FSCK -fnvd $mdsdev" local fn=3 + local add_options [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && skip "ldiskfs only test" && return + if combined_mgs_mds; then + add_options='--reformat' + else + add_options='--reformat --replace' + fi + #tune MDT with "-O extents" for num in $(seq $MDSCOUNT); do add mds${num} $(mkfs_opts mds$num $(mdsdevname $num)) \ - --reformat $(mdsdevname $num) $(mdsvdevname $num) || + $add_options $(mdsdevname $num) $(mdsvdevname $num) || error "add mds $num failed" do_facet mds${num} "$TUNE2FS -O extents $(mdsdevname $num)" || error "$TUNE2FS failed on mds${num}" done - add ost1 $(mkfs_opts ost1 $ostdev) --reformat $ostdev || + add ost1 $(mkfs_opts ost1 $ostdev) $add_options $ostdev || error "add $ostdev failed" - start_mgsmds || error "start mds failed" + start_mds || error "start mds failed" start_ost || error "start ost failed" mount_client $MOUNT || error "mount client failed" -- 1.8.3.1