LU-2406 tests: remove USE_OFD from test-framework

Remove the old USE_OFD from test-framework.sh, since this is no
longer needed for master, but it confuses interop testing when
run with b2_3 (where it hits LU-1883 and causes random failures).

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I417ac3eb5b2cbb8b4cebfc5d7f3cd2cab1b0974d
Reviewed-on: http://review.whamcloud.com/4727
Tested-by: Hudson
Reviewed-by: Mike Pershin <mike.pershin@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Li Wei <wei.g.li@intel.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index 7569790..53135ae 100644 (file)
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -72,8 +72,7 @@ ZFS_MKFS_OPTS=${ZFS_MKFS_OPTS:-}
 # LOAD_MODULES_REMOTE is true or b) modprobe(8) is configured to
 # blacklist the undesired (and aliased the other, if necessary).
 #
-USE_OFD=${USE_OFD:-yes}
-LOAD_MODULES_REMOTE=${LOAD_MODULES_REMOTE:-true}
+LOAD_MODULES_REMOTE=${LOAD_MODULES_REMOTE:-false}
 
 STRIPE_BYTES=${STRIPE_BYTES:-1048576}
 STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-0}

diff --git a/lustre/tests/sanity-quota-old.sh b/lustre/tests/sanity-quota-old.sh
index 582eb22..7c27fda 100755 (executable)
--- a/lustre/tests/sanity-quota-old.sh
+++ b/lustre/tests/sanity-quota-old.sh
@@ -147,11 +147,6 @@ FAIL_ON_ERROR=false
 run_test_with_stat() {
        (($# != 2)) && error "the number of arguments is wrong"
 
-       if [ "$USE_OFD" == "yes" ]; then
-               run_test "$@"
-               return
-       fi
-
        do_facet $SINGLEMDS "lctl set_param lquota.mdd_obd-${FSNAME}-MDT*.stats=0" > /dev/null
        for j in `seq $OSTCOUNT`; do
            do_facet ost$j "lctl set_param lquota.${FSNAME}-OST*.stats=0" > /dev/null

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index b941b1c..a3f328b 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -282,8 +282,6 @@ init_test_env() {
             IDENTITY_UPCALL=false
             ;;
     esac
-    USE_OFD=${USE_OFD:-yes}
-    [ "$USE_OFD" = "yes" ] && LOAD_MODULES_REMOTE=true
 
     export LOAD_MODULES_REMOTE=${LOAD_MODULES_REMOTE:-false}
 
@@ -425,8 +423,6 @@ llite_lloop_enabled() {
 }
 
 load_modules_local() {
-       [ $(facet_fstype ost1) == "zfs" ] && export USE_OFD=yes
-
        if [ -n "$MODPROBE" ]; then
                # use modprobe
                echo "Using modprobe to load modules"
@@ -2486,8 +2482,6 @@ get_env_vars() {
                echo -n " ${var}=\"$value\""
        done
 
-       echo -n " USE_OFD=$USE_OFD"
-
        for facet in ${facets//,/ }; do
                var=${facet}_FSTYPE
                if [ -n "${!var}" ]; then