X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmdsrate-lookup-10dirs.sh;h=2d235ff2eb4ff3dc3712450c304d68b13475826e;hb=1de3c3455868670c289ed1d69f57244816ea39b5;hp=7dd3c59bdd92286988a1ec2db3181e420a018d7c;hpb=e2e30106bc0c70da0111f9d677e5e671701ee932;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mdsrate-lookup-10dirs.sh b/lustre/tests/mdsrate-lookup-10dirs.sh
index 7dd3c59..2d235ff 100644
--- a/lustre/tests/mdsrate-lookup-10dirs.sh
+++ b/lustre/tests/mdsrate-lookup-10dirs.sh
@@ -37,7 +37,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 +56,13 @@ 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"
 
@@ -70,9 +85,10 @@ else
 
     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
@@ -85,6 +101,7 @@ else
 	# 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
@@ -106,6 +123,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_all
 		exit 1
 	fi
@@ -124,12 +142,14 @@ 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_all
 		exit 1
 	fi
 fi
 
 complete $SECONDS
+restore_lustre_params < $p
 mdsrate_cleanup_all
 rmdir $BASEDIR || true
 rm -f $MACHINEFILE