From a9d854ea63abf918fcb89529453e48a99a002a25 Mon Sep 17 00:00:00 2001 From: Emoly Liu Date: Fri, 23 Sep 2016 16:39:18 +0800 Subject: [PATCH] LU-8635 tests: Use wait_update to expire jobstats Instead of arbitarily adjusting sleep count, use wait_update() with maximum of (left+5) seconds to expire old jobstats. Test-Parameters: trivial Seagate-bug-id: MRP-2781 Signed-off-by: Ashish Purkar Signed-off-by: Emoly Liu Change-Id: I75e017fc75d35faf1754faddfed168c0fbf432fe Reviewed-on: https://review.whamcloud.com/22699 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 50573b0..17482f5 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -12111,8 +12111,10 @@ test_205() { # Job stats cmd="mv -f $DIR/$tfile $DIR/$tdir.rename" verify_jobstats "$cmd" "$SINGLEMDS" # jobstats expiry - sleep until old stats should be expired - local left=$((interval_new + 2 - (SECONDS - start))) - [ $left -ge 0 ] && echo "sleep $left for expiry" && sleep $((left + 1)) + local left=$((interval_new + 5 - (SECONDS - start))) + [ $left -ge 0 ] && wait_update_facet $SINGLEMDS \ + "lctl get_param *.*.job_stats | grep -c 'job_id.*mkdir'" \ + "0" $left cmd="mkdir $DIR/$tdir.expire" verify_jobstats "$cmd" "$SINGLEMDS" [ $(do_facet $SINGLEMDS lctl get_param *.*.job_stats | -- 1.8.3.1