From 7a4ef1363921b067194f6af5a4b79baa6099820a Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Mon, 26 Sep 2022 15:01:41 +0530 Subject: [PATCH] LU-16187 tests: Fix is_project_quota_supported() is_project_quota_supported() is called from sanity-quota.sh to verify if the ldiskfs FS $ENABLE_PROJECT_QUOTAS is true and to verify if current version of lfs command supports 'project'. To do this it calls 'lfs --help' which is not supported. This patch moves 'lfs --help' call to 'lfs --list-commands' call to verify if the present version of lfs supports 'project' Lustre-change: https://review.whamcloud.com/48654 Lustre-commit: d4848d779bb8716c6df2fe5438fbe00997f87f3d Test-Parameters: trivial testlist=sanity-quota Signed-off-by: Arshad Hussain Change-Id: Iba7e6696d3fa9e980088f448ae72b07a4b47f4f2 Reviewed-by: Andreas Dilger Reviewed-by: Hongchao Zhang Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49449 Tested-by: jenkins Tested-by: Maloo --- lustre/tests/test-framework.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 860b1fc..79b23cd 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -10027,7 +10027,8 @@ is_project_quota_supported() { [[ "$(facet_fstype $SINGLEMDS)" == "ldiskfs" && $(lustre_version_code $SINGLEMDS) -gt $(version_code 2.9.55) ]] && - do_facet mds1 lfs --help |& grep -q project && return 0 + do_facet mds1 lfs --list-commands |& grep -q project && + return 0 [[ "$(facet_fstype $SINGLEMDS)" == "zfs" && $(lustre_version_code $SINGLEMDS) -gt $(version_code 2.10.53) ]] && -- 1.8.3.1