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

[fs/lustre-release.git] / lustre / tests / test-framework.sh

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index ea998e0..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() {
+       [ $(facet_fstype ost1) == "zfs" ] && export USE_OFD=yes
        if [ "$USE_OFD" == yes ]; then
                if module_loaded obdfilter; then
                        if ! $LUSTRE_RMMOD ldiskfs; then
@@ -471,9 +472,9 @@ load_modules_local() {
                        load_module osd-ldiskfs/osd_ldiskfs
                fi
                load_module mdt/mdt
-               load_module cmm/cmm
                load_module ost/ost
                load_module lod/lod
+               load_module osp/osp
                if [ "$USE_OFD" == yes ]; then
                        load_module ofd/ofd
                else