LU-1873 test: Must set USE_OFD=yes when backend FS is zfs

We need to make sure that USE_OFD=yes when backend FS is
zfs by checking the *FSTYPE=zfs.

Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Change-Id: Ia8c646ea82a0ba19c0cc1b997e1c9322a4a54f01
Reviewed-on: http://review.whamcloud.com/3930
Tested-by: Hudson
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>

diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index 7a6184d..56c9c83 100644 (file)
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -82,6 +82,7 @@ ZFS_MKFS_OPTS=${ZFS_MKFS_OPTS:-}
 # blacklist the undesired (and aliased the other, if necessary).
 #
 USE_OFD=${USE_OFD:-no}
 # blacklist the undesired (and aliased the other, if necessary).
 #
 USE_OFD=${USE_OFD:-no}

+LOAD_MODULES_REMOTE=${LOAD_MODULES_REMOTE:-false}

 
 STRIPE_BYTES=${STRIPE_BYTES:-1048576}
 STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-0}
 
 STRIPE_BYTES=${STRIPE_BYTES:-1048576}
 STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-0}

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index b8e0101..f013315 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -375,6 +375,7 @@ llite_lloop_enabled() {
 }
 
 load_modules_local() {
 }
 
 load_modules_local() {

+       [ $(facet_fstype ost1) == "zfs" ] && export USE_OFD=yes

        if [ "$USE_OFD" == yes ]; then
                if module_loaded obdfilter; then
                        if ! $LUSTRE_RMMOD ldiskfs; then
        if [ "$USE_OFD" == yes ]; then
                if module_loaded obdfilter; then
                        if ! $LUSTRE_RMMOD ldiskfs; then