From: Bruno Faccini <bruno.faccini@intel.com>
Date: Wed, 4 Feb 2015 16:39:38 +0000 (+0100)
Subject: LU-6203 tests: early lock cancel to allow early copytool death
X-Git-Tag: 2.7.51~66
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F46%2F13646%2F2;p=fs%2Flustre-release.git

LU-6203 tests: early lock cancel to allow early copytool death

Since copytool death check+timing has been introduced with patch for
LU-5622, sanity-hsm/test_251() has experienced several failures
due to copytool death being delayed and to timeout, because of lock
cancel.

Signed-off-by: Bruno Faccini <bruno.faccini@intel.com>
Change-Id: I399b37854b98626c4c92a367d543b79aebf9eb4e
Reviewed-on: http://review.whamcloud.com/13646
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Henri Doreau <henri.doreau@cea.fr>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index c2c84ef..53f7f59 100755
--- a/lustre/tests/sanity-hsm.sh
+++ b/lustre/tests/sanity-hsm.sh
@@ -3979,6 +3979,10 @@ test_251() {
 	set_hsm_param loop_period 2
 	cdt_enable
 
+	# clear locks to avoid extra delay caused by flush/cancel
+	# and thus prevent early copytool death to timeout.
+	cancel_lru_locks osc
+
 	$LFS hsm_archive --archive $HSM_ARCHIVE_NUMBER $f
 	wait_request_state $fid ARCHIVE STARTED
 	sleep 5