From: Niu Yawei <yawei.niu@intel.com>
Date: Tue, 1 Sep 2015 04:44:02 +0000 (-0400)
Subject: LU-6359 test: fix test_10d of recovery-small
X-Git-Tag: 2.7.60~30
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=eac7b0ca8d2c915741bc6f9ca51562e83119a1ce

LU-6359 test: fix test_10d of recovery-small

Drop unused locks and replace drop_bl_callback_once() with
drop_bl_callback() to avoid interference from other cached locks.

Signed-off-by: Niu Yawei <yawei.niu@intel.com>
Change-Id: Id2846aed1f8e9e47e2a35fd8de122cc571002ffd
Reviewed-on: http://review.whamcloud.com/16155
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index 578f911..a2fb151 100755
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -210,12 +210,13 @@ test_10d() {
 
 	mount_client $MOUNT2
 
+	cancel_lru_locks osc
 	$LFS setstripe -i 0 -c 1 $DIR1/$tfile
 	echo -n hello > $DIR1/$tfile
 
 	stat $DIR2/$tfile >& /dev/null
 	$LCTL set_param fail_err=71
-	drop_bl_callback_once "echo -n \\\", world\\\" >> $DIR2/$tfile"
+	drop_bl_callback "echo -n \\\", world\\\" >> $DIR2/$tfile"
 
 	client_reconnect