X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=bdc08f27818316f874cf5863af32f5f3a1abb653;hp=531b14909cc1e76306a51dfb45f663bd690b1f58;hb=07b271c0972757772a129e9a6370dbb163f16a06;hpb=1ba794f6ec9e7ce7ad65fd74f170089fffc31d91

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 531b149..bdc08f2 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -70,7 +70,7 @@ LUSTRE_TESTS_API_DIR=${LUSTRE_TESTS_API_DIR:-${LUSTRE}/tests/clientapi}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/${NAME}.sh}
-get_lustre_env
+
 init_logging
 
 #                                  5          12          (min)"
@@ -9682,7 +9682,7 @@ run_test 119d "The DIO path should try to send a new rpc once one is completed"
 test_120a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run"
 	remote_mds_nodsh && skip "remote MDS with nodsh"
-	test_mkdir $DIR/$tdir
+	test_mkdir -i0 -c1 $DIR/$tdir
 	$LCTL get_param -n mdc.*.connect_flags | grep -q early_lock_cancel ||
 		skip_env "no early lock cancel on server"
 
@@ -9693,13 +9693,13 @@ test_120a() {
 	cancel_lru_locks osc
 
 	stat $DIR/$tdir > /dev/null
-	can1=$(do_facet $SINGLEMDS \
+	can1=$(do_facet mds1 \
 	       "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
 	       awk '/ldlm_cancel/ {print $2}')
 	blk1=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats |
 	       awk '/ldlm_bl_callback/ {print $2}')
-	test_mkdir -c1 $DIR/$tdir/d1
-	can2=$(do_facet $SINGLEMDS \
+	test_mkdir -i0 -c1 $DIR/$tdir/d1
+	can2=$(do_facet mds1 \
 	       "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
 	       awk '/ldlm_cancel/ {print $2}')
 	blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats |
@@ -9743,24 +9743,24 @@ run_test 120b "Early Lock Cancel: create test"
 test_120c() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run"
 	remote_mds_nodsh && skip "remote MDS with nodsh"
-	test_mkdir -c1 $DIR/$tdir
+	test_mkdir -i0 -c1 $DIR/$tdir
 	$LCTL get_param -n mdc.*.connect_flags | grep -q early_lock_cancel ||
 		skip "no early lock cancel on server"
 
 	lru_resize_disable mdc
 	lru_resize_disable osc
-	test_mkdir -c1 $DIR/$tdir/d1
-	test_mkdir -c1 $DIR/$tdir/d2
+	test_mkdir -i0 -c1 $DIR/$tdir/d1
+	test_mkdir -i0 -c1 $DIR/$tdir/d2
 	touch $DIR/$tdir/d1/f1
 	cancel_lru_locks mdc
 	stat $DIR/$tdir/d1 $DIR/$tdir/d2 $DIR/$tdir/d1/f1 > /dev/null
-	can1=$(do_facet $SINGLEMDS \
+	can1=$(do_facet mds1 \
 	       "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
 	       awk '/ldlm_cancel/ {print $2}')
 	blk1=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats |
 	       awk '/ldlm_bl_callback/ {print $2}')
 	ln $DIR/$tdir/d1/f1 $DIR/$tdir/d2/f2
-	can2=$(do_facet $SINGLEMDS \
+	can2=$(do_facet mds1 \
 	       "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
 	       awk '/ldlm_cancel/ {print $2}')
 	blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats |
@@ -9775,7 +9775,7 @@ run_test 120c "Early Lock Cancel: link test"
 test_120d() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run"
 	remote_mds_nodsh && skip "remote MDS with nodsh"
-	test_mkdir -c1 $DIR/$tdir
+	test_mkdir -i0 -c1 $DIR/$tdir
 	$LCTL get_param -n mdc.*.connect_flags | grep -q early_lock_cancel ||
 		skip_env "no early lock cancel on server"
 
@@ -9784,13 +9784,13 @@ test_120d() {
 	touch $DIR/$tdir
 	cancel_lru_locks mdc
 	stat $DIR/$tdir > /dev/null
-	can1=$(do_facet $SINGLEMDS \
+	can1=$(do_facet mds1 \
 	       "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
 	       awk '/ldlm_cancel/ {print $2}')
 	blk1=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats |
 	       awk '/ldlm_bl_callback/ {print $2}')
 	chmod a+x $DIR/$tdir
-	can2=$(do_facet $SINGLEMDS \
+	can2=$(do_facet mds1 \
 	       "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
 	       awk '/ldlm_cancel/ {print $2}')
 	blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats |
@@ -9810,7 +9810,7 @@ test_120e() {
 
 	local dlmtrace_set=false
 
-	test_mkdir -c1 $DIR/$tdir
+	test_mkdir -i0 -c1 $DIR/$tdir
 	lru_resize_disable mdc
 	lru_resize_disable osc
 	! $LCTL get_param debug | grep -q dlmtrace &&
@@ -9824,14 +9824,14 @@ test_120e() {
 	# during unlink (LU-4206), so cancel osc lock now.
 	sleep 2
 	cancel_lru_locks osc
-	can1=$(do_facet $SINGLEMDS \
+	can1=$(do_facet mds1 \
 	       "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
 	       awk '/ldlm_cancel/ {print $2}')
 	blk1=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats |
 	       awk '/ldlm_bl_callback/ {print $2}')
 	unlink $DIR/$tdir/f1
 	sleep 5
-	can2=$(do_facet $SINGLEMDS \
+	can2=$(do_facet mds1 \
 	       "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
 	       awk '/ldlm_cancel/ {print $2}')
 	blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats |
@@ -9852,11 +9852,11 @@ test_120f() {
 		skip_env "no early lock cancel on server"
 	remote_mds_nodsh && skip "remote MDS with nodsh"
 
-	test_mkdir -c1 $DIR/$tdir
+	test_mkdir -i0 -c1 $DIR/$tdir
 	lru_resize_disable mdc
 	lru_resize_disable osc
-	test_mkdir -c1 $DIR/$tdir/d1
-	test_mkdir -c1 $DIR/$tdir/d2
+	test_mkdir -i0 -c1 $DIR/$tdir/d1
+	test_mkdir -i0 -c1 $DIR/$tdir/d2
 	dd if=/dev/zero of=$DIR/$tdir/d1/f1 count=1
 	dd if=/dev/zero of=$DIR/$tdir/d2/f2 count=1
 	cancel_lru_locks mdc
@@ -9868,14 +9868,14 @@ test_120f() {
 	# during rename (LU-4206), so cancel osc lock now.
 	sleep 2
 	cancel_lru_locks osc
-	can1=$(do_facet $SINGLEMDS \
+	can1=$(do_facet mds1 \
 	       "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
 	       awk '/ldlm_cancel/ {print $2}')
 	blk1=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats |
 	       awk '/ldlm_bl_callback/ {print $2}')
 	mrename $DIR/$tdir/d1/f1 $DIR/$tdir/d2/f2
 	sleep 5
-	can2=$(do_facet $SINGLEMDS \
+	can2=$(do_facet mds1 \
 	       "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
 	       awk '/ldlm_cancel/ {print $2}')
 	blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats |