From c5e80faaee65c15bccf3d81a4504bba862cd8fbe Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Thu, 21 Mar 2024 11:43:43 +0700 Subject: [PATCH] LU-17525 tests: sanity/133a interop version checking sanity/133a with 2.15.4 and master fails with: Error: 'The open counter on mds1 is 1, not 2' Add a version check for at least 2.15.62 to exclude the extra checks when the MDS does not have v2_15_61-63-g055f939979 Test-Parameters: testlist=sanity env=ONLY=133a clientarch=aarch64 clientdistro=el8.8 Test-Parameters: testlist=sanity env=ONLY=133a serverversion=2.15.4 serverdistro=el8.8 Test-Parameters: testlist=sanity env=ONLY=133a clientarch=aarch64 clientdistro=el8.8 serverversion=2.15.4 serverdistro=el8.8 Fixes: 055f939979 ("LU-17481 mdt: count all opens in mdt.*.md_stats") Signed-off-by: Shaun Tancheff Change-Id: Ibb6eca7a5dcf295b419f7025a0167d70babe0f1f Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54466 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Patrick Farrell Reviewed-by: Oleg Drokin Reviewed-by: Andreas Dilger --- lustre/tests/sanity.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index c9f1ee5..6c23488 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -15843,10 +15843,12 @@ test_133a() { touch ${testdir}/${tfile} || error "touch failed" check_stats $SINGLEMDS "open" 1 check_stats $SINGLEMDS "close" 1 - # open should match close - ls -lR ${testdir} - check_stats $SINGLEMDS "open" 2 - check_stats $SINGLEMDS "close" 2 + (( $MDS1_VERSION >= $(version_code 2.15.62) )) && { + # open should match close + ls -lR ${testdir} + check_stats $SINGLEMDS "open" 2 + check_stats $SINGLEMDS "close" 2 + } [ $MDS1_VERSION -ge $(version_code 2.8.54) ] && { mknod ${testdir}/${tfile}-pipe p || error "mknod failed" check_stats $SINGLEMDS "mknod" 2 -- 1.8.3.1