From: John L. Hammond <john.hammond@intel.com>
Date: Wed, 13 Jul 2016 16:31:42 +0000 (-0500)
Subject: LU-6638 test: wait for grace delay in sanity-hsm test_37()
X-Git-Tag: 2.8.59~25
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=c782be8d0ecc3d8ac3c418252ecae18b9de345a5

LU-6638 test: wait for grace delay in sanity-hsm test_37()

In sanity-hsm test_37(), allow the previous archive request to expire
from the actions log by calling wait_for_grace_delay().

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I42fe4eec44734a9afd59f67d4532c1fe23402269
Reviewed-on: http://review.whamcloud.com/21284
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Frank Zago <fzago@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index 7d0bdf3..fd4e3e7 100755
--- a/lustre/tests/sanity-hsm.sh
+++ b/lustre/tests/sanity-hsm.sh
@@ -2901,6 +2901,9 @@ test_37() {
 	wait_request_state $fid ARCHIVE SUCCEED
 	$LFS hsm_release $f || error "cannot release $f"
 
+	# Allow previous archive request to expire from the actions log.
+	wait_for_grace_delay
+
 	# Dirty file.
 	dd if=/dev/urandom of=$f bs=1M count=1 || error "cannot dirty file"