From c9cc00af20b1188e8ffb4fef9088ae137022d7c8 Mon Sep 17 00:00:00 2001 From: Bruno Faccini Date: Mon, 4 Nov 2013 14:59:55 +0100 Subject: [PATCH] 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 Change-Id: I9709d9e665b66fb5d16e93c7139fa8d95fa92589 Reviewed-on: http://review.whamcloud.com/8154 Tested-by: Jenkins Reviewed-by: jacques-Charles Lafoucriere Reviewed-by: James Nunez Tested-by: Maloo Reviewed-by: Oleg Drokin Reviewed-on: http://review.whamcloud.com/8720 --- lustre/tests/sanity-hsm.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 } -- 1.8.3.1