From 8c5d21639ae3628a398ff5556ed90b58d41c456b Mon Sep 17 00:00:00 2001 From: Nathaniel Clark Date: Thu, 25 Jul 2013 09:32:11 -0400 Subject: [PATCH] LU-4121 tests: Enable zfs tests dependent on ost,mgs ordering This enables tests that were marked as skipped for bug LU-2059, now tracked as LU-4274. The skipped tests are ones failing due to mounting OSTs without MGS started causes OST mount to hang and wait for MGS. Test-Parameters: trivial osscount=2 mdscount=2 ostcount=2 mdtcount=1 mdtfilesystemtype=zfs ostfilesystemtype=zfs testlist=conf-sanity,insanity,sanity-quota Signed-off-by: Nathaniel Clark Change-Id: I3e27a7583c857d416ef3a0bd2d5ee74814975def Reviewed-on: https://review.whamcloud.com/7113 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Mike Pershin Reviewed-by: Lai Siyao Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 9 ++++----- lustre/tests/insanity.sh | 3 --- lustre/tests/sanity-quota.sh | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 19eabf5..937cd92 100755 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -455,17 +455,16 @@ run_test 5c "cleanup after failed mount (bug 2712) (should return errs)" test_5d() { grep " $MOUNT " /etc/mtab && - error false "unexpected entry in mtab before mount" && return 10 + error "unexpected entry in mtab before mount" start_ost || error "OST start failed" start_mds || error "MDS start failed" - stop_ost || error "Unable to stop OST1" + stop_ost -f || error "Unable to stop OST1" mount_client $MOUNT || error "mount_client $MOUNT failed" umount_client $MOUNT -f || error "umount_client $MOUNT failed" cleanup_nocli || error "cleanup_nocli failed with $?" - grep " $MOUNT " /etc/mtab && + ! grep " $MOUNT " /etc/mtab || error "$MOUNT entry in mtab after unmount" - pass } run_test 5d "mount with ost down" @@ -702,7 +701,7 @@ run_test 19a "start/stop MDS without OSTs" test_19b() { start_ost || error "Unable to start OST1" - stop_ost || error "Unable to stop OST1" + stop_ost -f || error "Unable to stop OST1" } run_test 19b "start/stop OSTs without MDS" diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh index cadaaea..4de13a34 100755 --- a/lustre/tests/insanity.sh +++ b/lustre/tests/insanity.sh @@ -173,9 +173,6 @@ run_test 0 "Fail all nodes, independently" test_1() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return - [ "$(facet_fstype mds2)" = "zfs" ] && - skip "LU-2059: no local config for ZFS MDTs" && return - clients_up shutdown_facet mds1 diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index f443f68..2976b54 100755 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -46,8 +46,8 @@ if [ $(facet_fstype $SINGLEMDS) == ldiskfs ] && fi if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then -# bug number for skipped test: LU-2836 LU-6836 LU-2836 LU-2059 - ALWAYS_EXCEPT="$ALWAYS_EXCEPT 3 4a 6 7d" +# bug number for skipped test: LU-2836 LU-6836 LU-2836 + ALWAYS_EXCEPT="$ALWAYS_EXCEPT 3 4a 6" # bug number for skipped test: LU-5638 ALWAYS_EXCEPT="$ALWAYS_EXCEPT 11 33 34 35" # bug number: LU-2887 -- 1.8.3.1