Whamcloud - gitweb
LU-16187 tests: Fix is_project_quota_supported() 54/48654/2
authorArshad Hussain <arshad.hussain@aeoncomputing.com>
Mon, 26 Sep 2022 09:31:41 +0000 (15:01 +0530)
committerOleg Drokin <green@whamcloud.com>
Tue, 25 Oct 2022 17:27:57 +0000 (17:27 +0000)
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 verfiy if the present
version of lfs supports 'project'

Test-Parameters: trivial testlist=sanity-quota
Signed-off-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Change-Id: Iba7e6696d3fa9e980088f448ae72b07a4b47f4f2
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/48654
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Hongchao Zhang <hongchao@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
lustre/tests/test-framework.sh

index 2e72bf5..eb9ee3f 100755 (executable)
@@ -10212,7 +10212,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) ]] &&