LU-15152 tests: auster reports wrong testsuite status

[fs/lustre-release.git] / lustre / tests / mdsrate-lookup-10dirs.sh

diff --git a/lustre/tests/mdsrate-lookup-10dirs.sh b/lustre/tests/mdsrate-lookup-10dirs.sh
index 8f772e0..2d235ff 100644 (file)
--- a/lustre/tests/mdsrate-lookup-10dirs.sh
+++ b/lustre/tests/mdsrate-lookup-10dirs.sh
@@ -10,13 +10,12 @@
 # #1 and from all nodes for #2 aggregate test to measure lookup performance.
 # TEst performs lookups across all 10 directories.
 
-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
 
@@ -38,33 +37,58 @@ 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
-$LFS setstripe $BASEDIR -c 1
-get_stripe $BASEDIR
+mdsrate_STRIPEPARAMS=${mdsrate_STRIPEPARAMS:-${fs_STRIPEPARAMS:-"-c 1"}}
+setstripe_getstripe $BASEDIR $mdsrate_STRIPEPARAMS
 
 IFree=$(($(mdsrate_inodes_available) - NUM_DIRS))
 if [ $IFree -lt $((NUM_FILES * NUM_DIRS)) ]; then
     NUM_FILES=$((IFree / NUM_DIRS))
 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
 
 DIRfmt="${BASEDIR}/lookup-%d"
 
+#
+# Unlink the files created in the directories under $BASEDIR.
+# FIXME: does it make sense to add the possibility to unlink dirfmt to mdsrate?
+#
+mdsrate_cleanup_all() {
+       local i
+       for i in $(seq 0 $NUM_DIRS); do
+               mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
+                               $BASEDIR/lookup-$i 'f%%d' --ignore
+       done
+}
+
 if [ -n "$NOCREATE" ]; then
     echo "NOCREATE=$NOCREATE  => no file creation."
 else
-    # FIXME: does it make sense to add the possibility to unlink dirfmt to mdsrate?
-    for i in $(seq 0 $NUM_DIRS); do
-        mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $BASEDIR/lookup-$i 'f%%d' --ignore
-    done
+       mdsrate_cleanup_all
 
     log "===== $0 Test preparation: creating ${NUM_DIRS} dirs with ${NUM_FILES} files."
 
-    COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --mknod
-                        --ndirs ${NUM_DIRS} --dirfmt '${DIRfmt}'
-                        --nfiles ${NUM_FILES} --filefmt 'f%%d'"
+       COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --mknod
+               --ndirs ${NUM_DIRS} --dirfmt '${DIRfmt}'
+               --nfiles ${NUM_FILES} --filefmt 'f%%d'
+               $mdtcount_opt $debug_opt"
 
        echo "+" ${COMMAND}
        # For files creation we can use -np equal to NUM_DIRS
@@ -74,8 +98,13 @@ else
        mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_DIRS} \
                ${COMMAND} 2>&1
 
-    # No lookup if error occurs on file creation, abort.
-    [ ${PIPESTATUS[0]} != 0 ] && error "mdsrate file creation failed, aborting"
+       # No lookup 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_all
+               exit 1
+       fi
 fi
 
 COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --lookup --time ${TIME_PERIOD} ${SEED_OPTION}
@@ -91,10 +120,13 @@ else
        mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np 1 ${COMMAND} |
                tee ${LOG}
 
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-        error "mdsrate lookups on a single client failed, aborting"
-    fi
+       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_all
+               exit 1
+       fi
 fi
 
 # 2
@@ -107,19 +139,18 @@ else
        mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_CLIENTS} \
                ${COMMAND} | tee ${LOG}
 
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-        error "mdsrate lookups on multiple nodes failed, aborting"
-    fi
+       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_all
+               exit 1
+       fi
 fi
 
 complete $SECONDS
-# FIXME: does it make sense to add the possibility to unlink dirfmt to mdsrate?
-for i in $(seq 0 $NUM_DIRS); do
-       mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
-               $BASEDIR/lookup-$i 'f%%d' --ignore
-done
-
+restore_lustre_params < $p
+mdsrate_cleanup_all
 rmdir $BASEDIR || true
 rm -f $MACHINEFILE
 check_and_cleanup_lustre