From 8269ae4ad3f9004a90cd2afb3895102fd3c80570 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Wed, 23 Feb 2022 12:24:12 -0700 Subject: [PATCH] LU-15589 tests: skip sanity test_230s for interop Sanity test_230s was added in 2.14.52 but incorrectly checked for MDS version 2.13.57 for interop, likely because that was the version present at the time the patch was originally written, but it was only landed later. Test-Parameters: trivial serverversion=2.14.0 testlist=sanity env=ONLY=230s Fixes: 65e3e4050ec5 ("LU-14366 mdt: lfs mkdir should return -EEXIST if exists") Signed-off-by: Andreas Dilger Change-Id: I5d046ad224a29558866453972c9c33b5da3a9037 Reviewed-on: https://review.whamcloud.com/46598 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Lai Siyao Reviewed-by: Alena Nikitenko Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index f4eea8e..22fde7f 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -20447,8 +20447,8 @@ test_230r() { run_test 230r "migrate with too many local locks" test_230s() { - [ $MDS1_VERSION -ge $(version_code 2.13.57) ] || - skip "Need MDS version at least 2.13.57" + (( $MDS1_VERSION >= $(version_code 2.14.52) )) || + skip "Need MDS version at least 2.14.52" local mdts=$(comma_list $(mdts_nodes)) local restripe_status=$(do_facet mds1 $LCTL get_param -n \ @@ -20462,7 +20462,7 @@ test_230s() { do_nodes $mdts "$LCTL set_param mdt.*.enable_dir_restripe=$st" test_mkdir $DIR/$tdir $LFS mkdir $DIR/$tdir |& grep "File exists" || - error "$LFS mkdir doesn't return -EEXIST if target exists" + error "$LFS mkdir should return EEXIST if target exists" rmdir $DIR/$tdir done } -- 1.8.3.1