From 2299c5f106c61b21c8201523e0559c6cd1b3668f Mon Sep 17 00:00:00 2001 From: Sergey Cheremencev Date: Thu, 30 Jan 2025 01:22:15 +0300 Subject: [PATCH] LU-16641 tests: 12b: unlink recently created files It is possible that createmany hasn't created requested number of files on mdt0. So remove only the number of successfully created files instead of requested. Fix error_ignore to avoid default error behaviour. Fixes: 25896b8b88 ("LU-16641 tests: fix sanity-quota_12b") Signed-off-by: Sergey Cheremencev Change-Id: Ic6d5a02295c73fbed0773408c67a47850dee1f80 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57929 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Arshad Hussain Reviewed-by: Artem Blagodarenko Reviewed-by: Oleg Drokin --- lustre/tests/sanity-quota.sh | 7 +++++-- lustre/tests/test-framework.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index 18a4df7..c7dcc29 100755 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -2625,14 +2625,17 @@ test_12b() { error "set quota failed" echo "Create $ilimit files on mdt0..." - $RUNAS createmany -m $TESTFILE0 $ilimit || true + local mdt0_created=$($RUNAS createmany -m $TESTFILE0 $ilimit | + awk '/total:/ {print $2}') + echo "mdt0 created $mdt0_created" echo "Create files on mdt1..." $RUNAS createmany -m $TESTFILE1 1 && quota_error a $TSTUSR "create succeeded, expect EDQUOT" echo "Free space from mdt0..." - $RUNAS unlinkmany $TESTFILE0 $ilimit || error "unlink mdt0 files failed" + $RUNAS unlinkmany $TESTFILE0 $mdt0_created || + error "unlink mdt0 files failed" wait_delete_completed sync_all_data || true diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index f03bed3a..a3bb1ac 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -7248,7 +7248,7 @@ error_exit() { error_ignore() { local TYPE="IGNORE ($1)" shift - report_error "$@" + report_error false "$@" } error_and_remount() { -- 1.8.3.1