From f1e9fcedca9a5eb1bd914b101eac4eaa664248ec Mon Sep 17 00:00:00 2001 From: Sergey Cheremencev Date: Thu, 7 Nov 2024 22:38:28 -0800 Subject: [PATCH] LU-16641 tests: fix sanity-quota_12b Fix sanity-quota_12b to don't fail after creating $ilimit files with the same inode hardlmit. It is a legal case to fail create 2048 files when inode hard limit is also 2048. Lustre-change: https://review.whamcloud.com/53969 Lustre-commit: 25896b8b88207e181eba4994323865cce9878800 Test-Parameters: trivial fstype=zfs \ env=ONLY=12b,ONLY_REPEAT=100 testlist=sanity-quota Signed-off-by: Sergey Cheremencev Change-Id: Iea2e976ad1954dc2489ffa81e92e624364343069 Reviewed-by: Andreas Dilger Reviewed-by: Alex Zhuravlev Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56929 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/sanity-quota.sh | 8 +++++--- lustre/tests/test-framework.sh | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index 3a14397..709739c 100755 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -2471,15 +2471,17 @@ test_12b() { error "set quota failed" echo "Create $ilimit files on mdt0..." - $RUNAS createmany -m $TESTFILE0 $ilimit || - quota_error u $TSTUSR "create failed, but expect success" + 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 075ee67..78bfd3b 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -6472,7 +6472,7 @@ error_exit() { error_ignore() { local TYPE="IGNORE ($1)" shift - report_error "$@" + report_error false "$@" } error_and_remount() { -- 1.8.3.1