X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=8ec81119433fd5c0ad7b09bad33baa330a2c2a92;hb=refs%2Fchanges%2F26%2F18826%2F3;hp=74ec39f95012635f024b995e47747a98bf3aedba;hpb=a9b3317360261b9a694a445e4dac1d3fa61664fd;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 74ec39f..8ec8111 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -8125,16 +8125,20 @@ run_test 120d "Early Lock Cancel: setattr test"
 
 test_120e() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-        test_mkdir -p -c1 $DIR/$tdir
-        [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \
-               skip "no early lock cancel on server" && return 0
-        lru_resize_disable mdc
-        lru_resize_disable osc
-        dd if=/dev/zero of=$DIR/$tdir/f1 count=1
-        cancel_lru_locks mdc
-        cancel_lru_locks osc
-        dd if=$DIR/$tdir/f1 of=/dev/null
-        stat $DIR/$tdir $DIR/$tdir/f1 > /dev/null
+	! $($LCTL get_param -n mdc.*.connect_flags | grep -q early_lock_can) &&
+		skip "no early lock cancel on server" && return 0
+	local dlmtrace_set=false
+
+	test_mkdir -p -c1 $DIR/$tdir
+	lru_resize_disable mdc
+	lru_resize_disable osc
+	! $LCTL get_param debug | grep -q dlmtrace &&
+		$LCTL set_param debug=+dlmtrace && dlmtrace_set=true
+	dd if=/dev/zero of=$DIR/$tdir/f1 count=1
+	cancel_lru_locks mdc
+	cancel_lru_locks osc
+	dd if=$DIR/$tdir/f1 of=/dev/null
+	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.
 	cancel_lru_locks osc
@@ -8150,8 +8154,11 @@ test_120e() {
 	       awk '/ldlm_cancel/ {print $2}')
 	blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats |
 	       awk '/ldlm_bl_callback/ {print $2}')
-	[ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured."
-	[ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
+	[ $can1 -ne $can2 ] && error "$((can2 - can1)) cancel RPC occured" &&
+		$LCTL dk $TMP/cancel.debug.txt
+	[ $blk1 -ne $blk2 ] && error "$((blk2 - blk1)) blocking RPC occured" &&
+		$LCTL dk $TMP/blocking.debug.txt
+	$dlmtrace_set && $LCTL set_param debug=-dlmtrace
 	lru_resize_enable mdc
 	lru_resize_enable osc
 }