From fda0fb235afd892099a950a109ba148da4866eb8 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Wed, 9 Oct 2024 17:33:16 -0600 Subject: [PATCH] LU-18226 tests: allow small margin for unevicted pages Allow a small margin for unevictable pages in case of memory pressure. Test-Parameters: trivial Fixes: 2a3ec2fea3 ("LU-17463 osc: add support for unevictable mlock()ed pages") Signed-off-by: Andreas Dilger Change-Id: I3f1cbacfdf53f217d9ebcbeb1b34693d27f70901 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56637 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Colin Faber Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 8825f32..a6ad1d1 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -32151,7 +32151,7 @@ test_600b() { awk '/^used_mb/ { print $2 }') unevict_mb=$($LCTL get_param -n llite.*.unevict_cached_mb) (( $used_mb == 0 )) || error "used_mb is $used_mb, expected 0" - (( $unevict_mb == $size_mb )) || + (( $unevict_mb >= $size_mb - 1)) || # allow a margin of 1 page error "unevict_mb is $unevict_mb, expected $size_mb" } run_test 600b "mlock a file (via vmtouch) larger than max_cached_mb" @@ -32189,10 +32189,10 @@ test_600c() { local cached_mb=$($LCTL get_param llite.*.max_cached_mb | awk '/^used_mb/ { print $2 }') - [ $cached_mb -eq 0 ] || error "expected used_mb 0 got $cached_mb" + (( $cached_mb == 0 )) || error "expected used_mb 0 got $cached_mb" cached_mb=$($LCTL get_param llite.*.max_cached_mb | awk '/^unevict_mb/ { print $2 }') - [ $cached_mb -eq 64 ] || error "expected unevict_mb 64 got $cached_mb" + (( $cached_mb == 64 )) || error "expected unevict_mb 64 got $cached_mb" vmtouch -vt $file2 || error "failed to vmtouch $file2" echo 3 > /proc/sys/vm/drop_caches @@ -32206,10 +32206,10 @@ test_600c() { $LCTL set_param llite.*.unevict_cached_mb=clear cached_mb=$($LCTL get_param llite.*.max_cached_mb | awk '/^used_mb/ { print $2 }') - [ $cached_mb -eq 0 ] || error "expected used_mb 0 got $cached_mb" + (( $cached_mb == 0 )) || error "expected used_mb 0 got $cached_mb" cached_mb=$($LCTL get_param llite.*.max_cached_mb | awk '/^unevict_mb/ { print $2 }') - [ $cached_mb -eq 0 ] || error "expected unevict_mb 0 got $cached_mb" + (( $cached_mb == 0 )) || error "expected unevict_mb 0 got $cached_mb" } run_test 600c "Test I/O when mlocked page count > @max_cached_mb" -- 1.8.3.1