LU-10994 test: remove netdisk from obdfilter-survey

[fs/lustre-release.git] / lustre / tests / mdsrate-create-small.sh

diff --git a/lustre/tests/mdsrate-create-small.sh b/lustre/tests/mdsrate-create-small.sh
index 16fdf05..bea656f 100644 (file)
--- a/lustre/tests/mdsrate-create-small.sh
+++ b/lustre/tests/mdsrate-create-small.sh
@@ -1,15 +1,13 @@
- #!/bin/bash
+#!/bin/bash
 #
 # This test was used in a set of CMD3 tests (cmd3-3 test).
 
-LUSTRE=${LUSTRE:-`dirname $0`/..}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
 assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN
 
-MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
 BASEDIR=$MOUNT/mdsrate
 
 # Requirements
@@ -40,7 +38,16 @@ log "===== $0 ====== "
 
 check_and_setup_lustre
 
-mkdir -p $BASEDIR
+MDSRATE_ENABLE_DNE=${MDSRATE_ENABLE_DNE:-false}
+if $MDSRATE_ENABLE_DNE; then
+       test_mkdir $BASEDIR
+       mdtcount_opt="--mdtcount $MDSCOUNT"
+else
+       mkdir $BASEDIR
+fi
+if $VERBOSE; then
+       debug_opt="--debug"
+fi
 chmod 0777 $BASEDIR
 mdsrate_STRIPEPARAMS=${mdsrate_STRIPEPARAMS:-${fs_STRIPEPARAMS:-"-i 0 -c 1"}}
 setstripe_getstripe $BASEDIR $mdsrate_STRIPEPARAMS
@@ -50,7 +57,13 @@ if [ $IFree -lt $NUM_FILES ]; then
     NUM_FILES=$IFree
 fi
 
-generate_machine_file $NODES_TO_USE $MACHINEFILE || error "can not generate machinefile"
+generate_machine_file $NODES_TO_USE $MACHINEFILE ||
+       error "can not generate machinefile"
+
+p="$TMP/$TESTSUITE-$TESTNAME.parameters"
+save_lustre_params $(get_facets MDS) mdt.*.enable_remote_dir_gid > $p
+do_nodes $(comma_list $(mdts_nodes)) \
+       $LCTL set_param mdt.*.enable_remote_dir_gid=-1
 
 if [ -n "$NOSINGLE" ]; then
     echo "NO Tests on single client."
@@ -64,7 +77,8 @@ else
         log "===== $0 ### 1 NODE CREATE ###"
 
        COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
-               --nfiles $NUM_FILES --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'"
+               --nfiles $NUM_FILES --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'
+               $mdtcount_opt $debug_opt"
        echo "+ ${COMMAND}"
        mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np 1 ${COMMAND} |
                tee ${LOG}
@@ -72,6 +86,7 @@ else
        if [ ${PIPESTATUS[0]} != 0 ]; then
                [ -f $LOG ] && sed -e "s/^/log: /" $LOG
                error_noexit "mdsrate create on single client failed, aborting"
+               restore_lustre_params < $p
                mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
                                $TESTDIR_SINGLE 'f%%d' --ignore
                exit 1
@@ -123,6 +138,7 @@ else
        if [ ${PIPESTATUS[0]} != 0 ]; then
                [ -f $LOG ] && sed -e "s/^/log: /" $LOG
                error_noexit "mdsrate create on multiple nodes failed, aborting"
+               restore_lustre_params < $p
                mdsrate_cleanup $((NUM_CLIENTS * THREADS_PER_CLIENT)) \
                                $MACHINEFILE $NUM_FILES \
                                $TESTDIR_MULTI 'f%%d' --ignore
@@ -151,6 +167,7 @@ else
 fi
 
 complete $SECONDS
+restore_lustre_params < $p
 rmdir $BASEDIR || true
 rm -f $MACHINEFILE
 check_and_cleanup_lustre