From: Patrick Farrell Date: Fri, 19 May 2023 16:24:25 +0000 (-0400) Subject: LU-16838 tests: use import name in 398a X-Git-Tag: 2.15.59~153 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=fd75e3c6c148fce7f02555010d8e3f8752717f0d;p=fs%2Flustre-release.git LU-16838 tests: use import name in 398a The LU-15670 test change assumes ost1_import is always OST0000. This isn't quite always true, so the test is failing in certain configurations. Change it to use the import name. Fixes: 649d638467 ("LU-15670 clio: Disable lockless for DIO with O_APPEND") Test-parameters: trivial Signed-off-by: Patrick Farrell Change-Id: Ifaefc503d1118ecd6fd45b661cbe94607f7ad799 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51064 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin Reviewed-by: Andreas Dilger Reviewed-by: Shaun Tancheff --- diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 099f16e..e4eab11 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -26357,7 +26357,7 @@ test_398a() { # LU-4198 ldlm.namespaces.$imp_name.lru_size) [[ $lock_count -eq 0 ]] || error "lock should be cancelled by direct IO" - $LCTL set_param ldlm.namespaces.*-OST0000-osc-ffff*.lru_size=clear + $LCTL set_param ldlm.namespaces.$imp_name.lru_size=clear # no lock cached, should use lockless DIO and not enqueue new lock dd if=/dev/zero of=$DIR/$tfile bs=1M count=1 oflag=direct conv=notrunc @@ -26365,13 +26365,13 @@ test_398a() { # LU-4198 ldlm.namespaces.$imp_name.lru_size) [[ $lock_count -eq 0 ]] || error "no lock should be held by direct IO" - $LCTL set_param ldlm.namespaces.*-OST0000-osc-ffff*.lru_size=clear + $LCTL set_param ldlm.namespaces.$imp_name.lru_size=clear # no lock cached, should use locked DIO append dd if=/dev/zero of=$DIR/$tfile bs=1M count=1 oflag=direct oflag=append \ conv=notrunc || error "DIO append failed" lock_count=$($LCTL get_param -n \ - ldlm.namespaces.*-OST0000-osc-ffff*.lru_size) + ldlm.namespaces.$imp_name.lru_size) [[ $lock_count -ne 0 ]] || error "lock still must be held by DIO append" } run_test 398a "direct IO should cancel lock otherwise lockless"