From 3a722005f376d0846f8fa3b8464131170ac58aec Mon Sep 17 00:00:00 2001 From: Sergey Cheremencev Date: Wed, 31 Mar 2021 15:13:53 +0300 Subject: [PATCH] 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 Lustre-change: https://review.whamcloud.com/45121/ Lustre-commit: I368e22b782bd3626f64907059ea329e94986535b Signed-off-by: Sergey Cheremencev Change-Id: I0e2d2c3df05c0053a1306dec9aa7353ce80162df Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54893 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/utils/lfs.c | 49 ++++++------------------------------------------- 1 file changed, 6 insertions(+), 43 deletions(-) diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index 3c556c1..52e6ac8 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -493,50 +493,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> ||||\n" - " -b -B \n" - " -i -I \n" - " setquota <-u|--user|-g|--group|-p|--projid> ||||\n" - " [--block-softlimit ]\n" - " [--block-hardlimit ]\n" - " [--inode-softlimit ]\n" - " [--inode-hardlimit ] \n" - " setquota [-t] <-u|--user|-g|--group|-p|--projid>\n" - " [--block-grace 'notify'|]\n" - " [--inode-grace 'notify'|] \n" - " setquota <-U|-G|-P>\n" - " -b -B \n" - " -i -I \n" - " setquota <-U|--default-usr|-G|--default-grp|-P|--default-prj>\n" - " [--block-softlimit ]\n" - " [--block-hardlimit ]\n" - " [--inode-softlimit ]\n" - " [--inode-hardlimit ] \n" - " setquota <-u|-g|-p> ||||\n" - " <-D|--default>\n" - " setquota {-u|-g|-p} --delete FILESYSTEM\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 |-i |-I " - "]\n" - " [<-u|-g|-p> ||||] \n" - " quota [-o |-i |-I ] -t <-u|-g|-p> \n" - " quota [-q] [-v] [h] <-U|-G|-P> "}, + "usage: quota [-q] [-v] [-h] [-o OBD_UUID|-i MDT_IDX|-I OST_IDX]\n" + " [{-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" -- 1.8.3.1