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>

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index 8b89a18..348f94d 100644 (file)
--- 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
 }