From da63bbc723dacac308ab9351d0537a521c7ef3c3 Mon Sep 17 00:00:00 2001 From: Yu Jian Date: Tue, 3 May 2011 20:55:30 +0800 Subject: [PATCH 1/1] LU-235 fix sanity test 36g to work with remote OSS Signed-off-by: Yu Jian Change-Id: Iccf7f109c69ac7dd34f9f5b7ee2d5ce4cb892053 Reviewed-on: http://review.whamcloud.com/488 Tested-by: Hudson Reviewed-by: Chris Gearing Reviewed-by: Brian J. Murrell Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 6e4e7ee..107035b 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -2071,15 +2071,26 @@ run_test 36f "utime on file racing with OST BRW write ==========" test_36g() { remote_ost_nodsh && skip "remote OST with nodsh" && return + local fmd_max_age + local fmd_before + local fmd_after mkdir -p $DIR/$tdir - export FMD_MAX_AGE=`do_facet ost1 lctl get_param -n obdfilter.*.client_cache_seconds 2> /dev/null | head -n 1` - FMD_BEFORE="`awk '/ll_fmd_cache/ { print $2 }' /proc/slabinfo`" + fmd_max_age=$(do_facet ost1 \ + "lctl get_param -n obdfilter.*.client_cache_seconds 2> /dev/null | \ + head -n 1") + + fmd_before=$(do_facet ost1 \ + "awk '/ll_fmd_cache/ {print \\\$2}' /proc/slabinfo") touch $DIR/$tdir/$tfile - sleep $((FMD_MAX_AGE + 12)) - FMD_AFTER="`awk '/ll_fmd_cache/ { print $2 }' /proc/slabinfo`" - [ "$FMD_AFTER" -gt "$FMD_BEFORE" ] && \ - echo "AFTER : $FMD_AFTER > BEFORE $FMD_BEFORE" && \ + sleep $((fmd_max_age + 12)) + fmd_after=$(do_facet ost1 \ + "awk '/ll_fmd_cache/ {print \\\$2}' /proc/slabinfo") + + echo "fmd_before: $fmd_before" + echo "fmd_after: $fmd_after" + [ "$fmd_after" -gt "$fmd_before" ] && \ + echo "AFTER: $fmd_after > BEFORE: $fmd_before" && \ error "fmd didn't expire after ping" || true } run_test 36g "filter mod data cache expiry =====================" -- 1.8.3.1