From: Bruno Faccini <bruno.faccini@intel.com>
Date: Mon, 4 Nov 2013 13:59:55 +0000 (+0100)
Subject: LU-4176 tests: do not wait for deleted HSM request record
X-Git-Tag: 2.5.1-RC1~86
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F20%2F8720%2F2;p=fs%2Flustre-release.git

LU-4176 tests: do not wait for deleted HSM request record

restore_and_check_size() function of sanity-hsm was systematically
waiting for restore request status, even if already flagged as
succeed. This extra wait can become forever if request record has
already been deleted.
Also fix wrong restore timing msg.

Signed-off-by: Bruno Faccini <bruno.faccini@intel.com>
Change-Id: I9709d9e665b66fb5d16e93c7139fa8d95fa92589
Reviewed-on: http://review.whamcloud.com/8154
Tested-by: Jenkins
Reviewed-by: jacques-Charles Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Reviewed-on: http://review.whamcloud.com/8720
---

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index b999f20..2c75002 100644
--- a/lustre/tests/sanity-hsm.sh
+++ b/lustre/tests/sanity-hsm.sh
@@ -1911,11 +1911,11 @@ restore_and_check_size() {
 		cpt=$((cpt + 1))
 	done
 	if [[ $cpt -lt 10 ]]; then
-		echo " restore is too long"
-	else
 		echo " "done
+	else
+		echo " restore is too long"
+		wait_request_state $fid RESTORE SUCCEED
 	fi
-	wait_request_state $fid RESTORE SUCCEED
 	return $err
 }