From: Sergey Cheremencev Date: Wed, 31 Mar 2021 12:13:53 +0000 (+0300) Subject: LU-15057 utils: pool quota man X-Git-Tag: 2.14.56~9 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=a7f8000f8b7da5273c7a66b9dfe4d281511f1628 LU-15057 utils: pool quota man Adding pool quota man for setquota and quota commands. Remove [-o |-i |-I ] from the case "lfs quota -t". Grace period is stored only at quota master. Furthermore, command lfs quota -t -I 0 /mnt/testfs fails with EOPNOTSUPP. Test-Parameters: trivial HPE-bug-id: LUS-9869 Change-Id: I368e22b782bd3626f64907059ea329e94986535b Reviewed-on: https://es-gerrit.dev.cray.com/158556 Reviewed-by: Alexander Boyko Reviewed-by: Elena Gryaznova Tested-by: Elena Gryaznova Signed-off-by: Sergey Cheremencev Reviewed-on: https://review.whamcloud.com/45121 Tested-by: jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Alexander Boyko Reviewed-by: Oleg Drokin --- diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index 3d22c9d..213dc09 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -449,48 +449,13 @@ command_t cmdlist[] = { "Usage: getname [--help|-h] [--instance|-i] [--fsname|-n] [path ...]"}, #ifdef HAVE_SYS_QUOTA_H {"setquota", lfs_setquota, 0, "Set filesystem quotas.\n" - "usage: setquota {-u|-g|-p} UNAME|UID|GNAME|GID|PROJID\n" - " -b BLOCK_SOFTLIMIT -B BLOCK_HARDLIMIT\n" - " -i INODE_SOFTLIMIT -I INODE_HARDLIMIT \n" - " setquota {-u|--user USER|UID|-g|--group GROUP|GID|-p|--projid PROJID}\n" - " [--block-softlimit BLOCK_SOFTLIMIT]\n" - " [--block-hardlimit BLOCK_HARDLIMIT]\n" - " [--inode-softlimit INODE_SOFTLIMIT]\n" - " [--inode-hardlimit INODE_HARDLIMIT] \n" - " setquota [-t] {-h|--help|-u|--user|-g|--group|-p|--projid}\n" - " [--block-grace 'notify'|BLOCK_GRACE]\n" - " [--inode-grace 'notify'|INODE_GRACE] \n" - " setquota {-U|-G|-P}\n" - " -b BLOCK_SOFTLIMIT -B BLOCK_HARDLIMIT\n" - " -i INODE_SOFTLIMIT -I INODE_HARDLIMIT \n" - " setquota {-U|--default-usr|-G|--default-grp|-P|--default-prj}\n" - " [--block-softlimit BLOCK_SOFTLIMIT]\n" - " [--block-hardlimit BLOCK_HARDLIMIT]\n" - " [--inode-softlimit INODE_SOFTLIMIT]\n" - " [--inode-hardlimit INODE_HARDLIMIT] \n" - " setquota {-u|-g|-p} UNAME|UID|GNAME|GID|PROJID\n" - " {-d|--default}\n" - " -b can be used instead of --block-softlimit/--block-grace\n" - " -B can be used instead of --block-hardlimit\n" - " -i can be used instead of --inode-softlimit/--inode-grace\n" - " -I can be used instead of --inode-hardlimit\n" - " -d can be used instead of --default\n\n" - "Note: The total quota space will be split into many qunits and\n" - " balanced over all server targets, the minimal qunit size is\n" - " 1M bytes for block space and 1K inodes for inode space.\n\n" - " The maximum quota grace time is 2^48 - 1 seconds.\n\n" - " Quota space rebalancing process will stop when this mininum\n" - " value is reached. As a result, quota exceeded can be returned\n" - " while many targets still have 1MB or 1K inodes of spare\n" - " quota space.\n\n" - " When setting the grace time, 'notify' can be used as grace to\n" - " be notified after the quota is over soft limit but prevents\n" - " the soft limit from becoming the hard limit."}, + "usage: setquota [-t][-d] {-u|-U|-g|-G|-p|-P} {-b|-B|-i|-I LIMIT} [--pool POOL] FILESYSTEM"}, {"quota", lfs_quota, 0, "Display disk usage and limits.\n" "usage: quota [-q] [-v] [-h] [-o OBD_UUID|-i MDT_IDX|-I OST_IDX]\n" - " [{-u|-g|-p} UNAME|UID|GNAME|GID|PROJID] \n" - " quota [-o OBD_UUID|-i MDT_IDX|-I OST_IDX] -t {-u|-g|-p} \n" - " quota [-q] [-v] [h] {-U|-G|-P} "}, + " [{-u|-g|-p} UNAME|UID|GNAME|GID|PROJID]\n" + " [--pool ] \n" + " quota -t <-u|-g|-p> [--pool ] \n" + " quota [-q] [-v] [h] {-U|-G|-P} [--pool ] "}, {"project", lfs_project, 0, "Change or list project attribute for specified file or directory.\n" "usage: project [-d|-r] \n"