LU-6142 tests: Fix style issues for statmany.c

[fs/lustre-release.git] / lustre / tests / mdsrate-lookup-1dir.sh

diff --git a/lustre/tests/mdsrate-lookup-1dir.sh b/lustre/tests/mdsrate-lookup-1dir.sh
index bb85a78..ea73dc9 100644 (file)
--- a/lustre/tests/mdsrate-lookup-1dir.sh
+++ b/lustre/tests/mdsrate-lookup-1dir.sh
@@ -9,13 +9,12 @@
 # perform lookups for 10 minutes. This test can be run from a single node for
 # #1 and from all nodes for #2 aggregate test to measure lookup performance.
 
-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}
 # Do not use name [df][0-9]* to avoid cleanup by rm, bug 18045
 BASEDIR=$MOUNT/mdsrate
 TESTDIR=$BASEDIR/lookup
@@ -37,7 +36,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:-"-c 1"}}
 setstripe_getstripe $BASEDIR $mdsrate_STRIPEPARAMS
@@ -47,7 +55,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 "$NOCREATE" ]; then
     echo "NOCREATE=$NOCREATE  => no file creation."
@@ -61,8 +75,9 @@ else
     if [ $NUM_CLIENTS -gt 50 ]; then
         NUM_THREADS=$NUM_CLIENTS
     fi
-    COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --mknod --dir ${TESTDIR}
-                        --nfiles ${NUM_FILES} --filefmt 'f%%d'"
+       COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --mknod --dir ${TESTDIR}
+               --nfiles ${NUM_FILES} --filefmt 'f%%d'
+               $mdtcount_opt $debug_opt"
        echo "+" ${COMMAND}
        mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_THREADS} \
                ${COMMAND} 2>&1
@@ -70,6 +85,7 @@ else
        # No lockup if error occurs on file creation, abort.
        if [ ${PIPESTATUS[0]} != 0 ]; then
                error_noexit "mdsrate file creation failed, aborting"
+               restore_lustre_params < $p
                mdsrate_cleanup $NUM_THREADS $MACHINEFILE $NUM_FILES \
                                $TESTDIR 'f%%d' --ignore
                exit 1
@@ -91,6 +107,7 @@ else
        if [ ${PIPESTATUS[0]} != 0 ]; then
                [ -f $LOG ] && sed -e "s/^/log: /" $LOG
                error_noexit "mdsrate lookup on single client failed, aborting"
+               restore_lustre_params < $p
                mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
                                $TESTDIR 'f%%d' --ignore
                exit 1
@@ -110,6 +127,7 @@ else
        if [ ${PIPESTATUS[0]} != 0 ]; then
                [ -f $LOG ] && sed -e "s/^/log: /" $LOG
                error_noexit "mdsrate lookup on multiple nodes failed, aborting"
+               restore_lustre_params < $p
                mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
                                $TESTDIR 'f%%d' --ignore
                exit 1
@@ -117,6 +135,7 @@ else
 fi
 
 complete $SECONDS
+restore_lustre_params < $p
 mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR 'f%%d'
 rmdir $BASEDIR || true
 rm -f $MACHINEFILE