X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=16546255fe167635e7d7482735fe49626eb5848e;hb=e240fb5099af8e62c532d314317095800ebb6864;hp=b4230394ffa18cc398231efa0dd18f653111f0db;hpb=b4a26e92d74265f134d71ba8c22362e266d366f4;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index b423039..1654625 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -3127,7 +3127,7 @@ test_38() {
 }
 run_test 38 "open a regular file with O_DIRECTORY should return -ENOTDIR ==="
 
-test_39() {
+test_39a() { # was test_39
 	touch $DIR/$tfile
 	touch $DIR/${tfile}2
 #	ls -l  $DIR/$tfile $DIR/${tfile}2
@@ -3145,7 +3145,7 @@ test_39() {
 		error "O_TRUNC didn't change timestamps"
 	fi
 }
-run_test 39 "mtime changed on create ==========================="
+run_test 39a "mtime changed on create ==========================="
 
 test_39b() {
 	test_mkdir -p -c1 $DIR/$tdir
@@ -3807,7 +3807,7 @@ test_42e() { # bug22074
 }
 run_test 42e "verify sub-RPC writes are not done synchronously"
 
-test_43() {
+test_43A() { # was test_43
 	test_mkdir -p $DIR/$tdir
 	cp -p /bin/ls $DIR/$tdir/$tfile
 	$MULTIOP $DIR/$tdir/$tfile Ow_c &
@@ -3818,7 +3818,7 @@ test_43() {
 	$DIR/$tdir/$tfile && error || true
 	kill -USR1 $pid
 }
-run_test 43 "execution of file opened for write should return -ETXTBSY"
+run_test 43A "execution of file opened for write should return -ETXTBSY"
 
 test_43a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
@@ -3859,12 +3859,12 @@ test_43c() {
 }
 run_test 43c "md5sum of copy into lustre========================"
 
-test_44() {
+test_44A() { # was test_44
 	[[ $OSTCOUNT -lt 2 ]] && skip_env "skipping 2-stripe test" && return
 	dd if=/dev/zero of=$DIR/f1 bs=4k count=1 seek=1023
 	dd if=$DIR/f1 bs=4k count=1 > /dev/null
 }
-run_test 44 "zero length read from a sparse stripe ============="
+run_test 44A "zero length read from a sparse stripe ============="
 
 test_44a() {
 	local nstripe=$($LCTL lov_getconfig $DIR | grep default_stripe_count: |
@@ -5746,10 +5746,6 @@ cleanup_68() {
 		rm -f $LLOOP
 		unset LLOOP
 	fi
-	if [ ! -z "$LLITELOOPLOAD" ]; then
-		rmmod llite_lloop
-		unset LLITELOOPLOAD
-	fi
 	rm -f $DIR/f68*
 }
 
@@ -5761,74 +5757,6 @@ swap_used() {
 	swapon -s | awk '($1 == "'$1'") { print $4 }'
 }
 
-# test case for lloop driver, basic function
-test_68a() {
-	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-	[ "$UID" != 0 ] && skip_env "must run as root" && return
-	llite_lloop_enabled || \
- 		{ skip_env "llite_lloop module disabled" && return; }
-
-	trap cleanup_68 EXIT
-
-	if ! module_loaded llite_lloop; then
-		if load_module llite/llite_lloop; then
-			LLITELOOPLOAD=yes
-		else
-			skip_env "can't find module llite_lloop"
-			return
-		fi
-	fi
-
-	LLOOP=$TMP/lloop.`date +%s`.`date +%N`
-	dd if=/dev/zero of=$DIR/f68a bs=4k count=1024
-	$LCTL blockdev_attach $DIR/f68a $LLOOP || error "attach failed"
-
-	directio rdwr $LLOOP 0 1024 4096 || error "direct write failed"
-	directio rdwr $LLOOP 0 1025 4096 && error "direct write should fail"
-
-	cleanup_68
-}
-run_test 68a "lloop driver - basic test ========================"
-
-# excercise swapping to lustre by adding a high priority swapfile entry
-# and then consuming memory until it is used.
-test_68b() {  # was test_68
-	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-	[ "$UID" != 0 ] && skip_env "must run as root" && return
-	lctl get_param -n devices | grep -q obdfilter && \
-		skip "local OST" && return
-
-	grep -q llite_lloop /proc/modules
-	[ $? -ne 0 ] && skip "can't find module llite_lloop" && return
-
-	[ -z "`$LCTL list_nids | grep -v tcp`" ] && \
-		skip "can't reliably test swap with TCP" && return
-
-	MEMTOTAL=`meminfo MemTotal`
-	NR_BLOCKS=$((MEMTOTAL>>8))
-	[[ $NR_BLOCKS -le 2048 ]] && NR_BLOCKS=2048
-
-	LLOOP=$TMP/lloop.`date +%s`.`date +%N`
-	dd if=/dev/zero of=$DIR/f68b bs=64k seek=$NR_BLOCKS count=1
-	mkswap $DIR/f68b
-
-	$LCTL blockdev_attach $DIR/f68b $LLOOP || error "attach failed"
-
-	trap cleanup_68 EXIT
-
-	swapon -p 32767 $LLOOP || error "swapon $LLOOP failed"
-
-	echo "before: `swapon -s | grep $LLOOP`"
-	$MEMHOG $MEMTOTAL || error "error allocating $MEMTOTAL kB"
-	echo "after: `swapon -s | grep $LLOOP`"
-	SWAPUSED=`swap_used $LLOOP`
-
-	cleanup_68
-
-	[ $SWAPUSED -eq 0 ] && echo "no swap used???" || true
-}
-run_test 68b "support swapping to Lustre ========================"
-
 # bug5265, obdfilter oa2dentry return -ENOENT
 # #define OBD_FAIL_SRV_ENOENT 0x217
 test_69() {
@@ -7356,7 +7284,8 @@ test_103a() {
 
 	SAVE_UMASK=$(umask)
 	umask 0022
-	cd $DIR
+	mkdir -p $DIR/$tdir
+	cd $DIR/$tdir
 
 	echo "performing cp ..."
 	run_acl_subtest cp || error "run_acl_subtest cp failed"
@@ -8410,6 +8339,7 @@ test_120e() {
 	stat $DIR/$tdir $DIR/$tdir/f1 > /dev/null
 	# XXX client can not do early lock cancel of OST lock
 	# during unlink (LU-4206), so cancel osc lock now.
+	sleep 2
 	cancel_lru_locks osc
 	can1=$(do_facet $SINGLEMDS \
 	       "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
@@ -8452,6 +8382,7 @@ test_120f() {
 	stat $DIR/$tdir/d1 $DIR/$tdir/d2 $DIR/$tdir/d1/f1 $DIR/$tdir/d2/f2 > /dev/null
 	# XXX client can not do early lock cancel of OST lock
 	# during rename (LU-4206), so cancel osc lock now.
+	sleep 2
 	cancel_lru_locks osc
 	can1=$(do_facet $SINGLEMDS \
 	       "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
@@ -12183,8 +12114,10 @@ test_205() { # Job stats
 	cmd="mv -f $DIR/$tfile $DIR/$tdir.rename"
 	verify_jobstats "$cmd" "$SINGLEMDS"
 	# jobstats expiry - sleep until old stats should be expired
-	local left=$((interval_new + 2 - (SECONDS - start)))
-	[ $left -ge 0 ] && echo "sleep $left for expiry" && sleep $((left + 1))
+	local left=$((interval_new + 5 - (SECONDS - start)))
+	[ $left -ge 0 ] && wait_update_facet $SINGLEMDS \
+		"lctl get_param *.*.job_stats | grep -c 'job_id.*mkdir'" \
+			"0" $left
 	cmd="mkdir $DIR/$tdir.expire"
 	verify_jobstats "$cmd" "$SINGLEMDS"
 	[ $(do_facet $SINGLEMDS lctl get_param *.*.job_stats |
@@ -13786,7 +13719,7 @@ test_241_dio() {
 	done
 }
 
-test_241() {
+test_241a() { # was test_241
 	dd if=/dev/zero of=$DIR/$tfile count=1 bs=40960
 	ls -la $DIR/$tfile
 	cancel_lru_locks osc
@@ -13795,7 +13728,7 @@ test_241() {
 	test_241_dio 1000
 	wait $PID
 }
-run_test 241 "bio vs dio"
+run_test 241a "bio vs dio"
 
 test_241b() {
 	dd if=/dev/zero of=$DIR/$tfile count=1 bs=40960