From 455f30ac2817d342125d886e54c67abd07133a73 Mon Sep 17 00:00:00 2001 From: Nathaniel Clark Date: Wed, 27 Jul 2016 10:46:08 -0400 Subject: [PATCH] LU-4444 test: Re-enable conf-sanity/69 for ZFS Enable conf-sanity/69 for ZFS now that ZFS is faster. Fix zpool import for conf-sanity/50i, should be mds2 not ost1. Test-Parameters: trivial testlist=conf-sanity mdsfilesystemtype=zfs mdtfilesystemtype=zfs ostfilesystemtype=zfs envdefinitions=SLOW=yes Signed-off-by: Nathaniel Clark Change-Id: I4a367e217ec05ab4f678f58f0ffae95d84e33cc6 Reviewed-on: http://review.whamcloud.com/21543 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Nunez Reviewed-by: Saurabh Tandan Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 654f684..19f2276 100755 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -78,8 +78,8 @@ if [[ "$LDISKFS_MKFS_OPTS" != *lazy_itable_init* ]]; then fi [ $(facet_fstype $SINGLEMDS) = "zfs" ] && -# bug number for skipped test: LU-4444 - ALWAYS_EXCEPT="$ALWAYS_EXCEPT 69" +# bug number for skipped test: + ALWAYS_EXCEPT="$ALWAYS_EXCEPT" init_logging @@ -3669,7 +3669,7 @@ test_50i() { # prepare MDT/OST, make OSC inactive for OST1 [ "$MDSCOUNT" -lt "2" ] && skip_env "$MDSCOUNT < 2, skipping" && return - [ $(facet_fstype ost1) == zfs ] && import_zpool ost1 + [ $(facet_fstype mds2) == zfs ] && import_zpool mds2 do_facet mds2 "$TUNEFS --param mdc.active=0 $(mdsdevname 2)" || error "tunefs MDT2 failed" start_mds || error "Unable to start MDT" -- 1.8.3.1