X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmdsrate-create-small.sh;h=79e76380527cad058e8859ceff34388acd286f05;hb=9898ae5347616a097193f69811a74af3ddd88349;hp=dcb8d562607f4897a3bb65a88166adbab823fd33;hpb=de677fa6395b2646fbeb9822c59f3e4547aefba6;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mdsrate-create-small.sh b/lustre/tests/mdsrate-create-small.sh
index dcb8d56..79e7638 100644
--- a/lustre/tests/mdsrate-create-small.sh
+++ b/lustre/tests/mdsrate-create-small.sh
@@ -1,15 +1,13 @@
  #!/bin/bash
 #
-# This test was used in a set of CMD3 tests (cmd3-3 test). 
+# 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
@@ -36,21 +34,36 @@ fi
 # Make sure we start with a clean slate
 rm -f ${LOG}
 
-log "===== $0 ====== " 
+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 -i 0 -c 1
-get_stripe $BASEDIR
+mdsrate_STRIPEPARAMS=${mdsrate_STRIPEPARAMS:-${fs_STRIPEPARAMS:-"-i 0 -c 1"}}
+setstripe_getstripe $BASEDIR $mdsrate_STRIPEPARAMS
 
 IFree=$(mdsrate_inodes_available)
 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,15 +77,20 @@ 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 -np 1 ${MACHINEFILE_OPTION} ${MACHINEFILE} ${COMMAND} |
+	mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np 1 ${COMMAND} |
 		tee ${LOG}
 
-        if [ ${PIPESTATUS[0]} != 0 ]; then
-            [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-            error "mdsrate create for a single client failed, aborting"
-        fi
+	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
+	fi
     fi
 
     if [ -n "$NOUNLINK" ]; then
@@ -83,7 +101,7 @@ else
         COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink
                      --nfiles ${NUM_FILES} --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'"
         echo "+ ${COMMAND}"
-        mpi_run -np 1 ${MACHINEFILE_OPTION} ${MACHINEFILE} ${COMMAND} |
+        mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np 1 ${COMMAND} |
 		tee ${LOG}
 
         if [ ${PIPESTATUS[0]} != 0 ]; then
@@ -113,12 +131,19 @@ else
 	COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
 		--nfiles $NUM_FILES --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
 	echo "+ ${COMMAND}"
-	mpi_run -np $((NUM_CLIENTS * THREADS_PER_CLIENT)) \
-		${MACHINEFILE_OPTION} ${MACHINEFILE} ${COMMAND} | tee ${LOG}
-        if [ ${PIPESTATUS[0]} != 0 ]; then
-            [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-            error "mdsrate create on multiple nodes failed, aborting"
-        fi
+	mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} \
+		-np $((NUM_CLIENTS * THREADS_PER_CLIENT)) ${COMMAND} |
+		tee ${LOG}
+
+	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
+		exit 1
+	fi
     fi
 
     if [ -n "$NOUNLINK" ]; then
@@ -129,8 +154,9 @@ else
         COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink
                       --nfiles ${NUM_FILES} --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
         echo "+ ${COMMAND}"
-        mpi_run -np $((NUM_CLIENTS * THREADS_PER_CLIENT)) \
-		${MACHINEFILE_OPTION} ${MACHINEFILE} ${COMMAND} | tee ${LOG}
+        mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} \
+		-np $((NUM_CLIENTS * THREADS_PER_CLIENT)) ${COMMAND} |
+		tee ${LOG}
         if [ ${PIPESTATUS[0]} != 0 ]; then
             [ -f $LOG ] && sed -e "s/^/log: /" $LOG
             error "mdsrate unlinks multiple nodes failed, aborting"
@@ -141,8 +167,9 @@ else
 fi
 
 complete $SECONDS
+restore_lustre_params < $p
 rmdir $BASEDIR || true
-rm -f $MACHINEFILE 
+rm -f $MACHINEFILE
 check_and_cleanup_lustre
 #rm -f $LOG