diff options
| author | Raghavendra G <rgowdapp@redhat.com> | 2013-11-14 17:05:26 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-11-26 10:25:27 -0800 |
| commit | 0d5cd92f51c02b8d664000b5a2d22a2ddbbc23b6 (patch) | |
| tree | 3410752aa6e3389f33fcb43679318eb159ab2c94 /rpc/xdr/src | |
| parent | ab3ab1978a4768e9eed8e23b47e72b25046e607a (diff) | |
cli/glusterd: Changes to quota command Quota feature
re-work.
Following are the cli commands that are new/re-worked:
======================================================
volume quota <VOLNAME> {enable|disable|list [<path> ...]|remove <path>| default-soft-limit <percent>} |
volume quota <VOLNAME> {limit-usage <path> <size> [<percent>]} |
volume quota <VOLNAME> {alert-time|soft-timeout|hard-timeout} {<time>}
volume status [all | <VOLNAME> [nfs|shd|<BRICK>|quotad]] [detail|clients|mem|inode|fd|callpool]
volume statedump <VOLNAME> [nfs|quotad] [all|mem|iobuf|callpool|priv|fd|inode|history]
glusterd changes:
=================
* Quota limits are now set as extended attributes by glusterd from
the aux mount created by the cli.
* The gfids of the directories on which quota limits are set
for a given volume are stored in
/var/lib/glusterd/vols/<volname>/quota.conf file in binary format,
and whose cksum and version is stored in
/var/lib/glusterd/vols/<volname>/quota.cksum.
Original-author: Krutika Dhananjay <kdhananj@redhat.com>
Original-author: Krishnan Parthasarathi <kparthas@redhat.com>
BUG: 969461
Change-Id: If32bba36c67f9c2a30417af9c6389045b2b7c13b
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Signed-off-by: Raghavendra G <rgowdapp@redhat.com>
Reviewed-on: http://review.gluster.org/6003
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'rpc/xdr/src')
| -rw-r--r-- | rpc/xdr/src/cli1-xdr.h | 5 | ||||
| -rw-r--r-- | rpc/xdr/src/cli1-xdr.x | 31 |
2 files changed, 23 insertions, 13 deletions
diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h index d418fabf399..0bed637e283 100644 --- a/rpc/xdr/src/cli1-xdr.h +++ b/rpc/xdr/src/cli1-xdr.h @@ -92,6 +92,10 @@ enum gf_quota_type { GF_QUOTA_OPTION_TYPE_REMOVE = 0 + 4, GF_QUOTA_OPTION_TYPE_LIST = 0 + 5, GF_QUOTA_OPTION_TYPE_VERSION = 0 + 6, + GF_QUOTA_OPTION_TYPE_ALERT_TIME = 0 + 7, + GF_QUOTA_OPTION_TYPE_SOFT_TIMEOUT = 0 + 8, + GF_QUOTA_OPTION_TYPE_HARD_TIMEOUT = 0 + 9, + GF_QUOTA_OPTION_TYPE_DEFAULT_SOFT_LIMIT = 0 + 10, }; typedef enum gf_quota_type gf_quota_type; @@ -166,6 +170,7 @@ enum gf_cli_status_type { GF_CLI_STATUS_BRICK = 0x0400, GF_CLI_STATUS_NFS = 0x0800, GF_CLI_STATUS_SHD = 0x1000, + GF_CLI_STATUS_QUOTAD = 0x2000, }; typedef enum gf_cli_status_type gf_cli_status_type; diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x index cc7ca8e248f..07327c72729 100644 --- a/rpc/xdr/src/cli1-xdr.x +++ b/rpc/xdr/src/cli1-xdr.x @@ -51,7 +51,11 @@ enum gf_quota_type { GF_QUOTA_OPTION_TYPE_LIMIT_USAGE, GF_QUOTA_OPTION_TYPE_REMOVE, GF_QUOTA_OPTION_TYPE_LIST, - GF_QUOTA_OPTION_TYPE_VERSION + GF_QUOTA_OPTION_TYPE_VERSION, + GF_QUOTA_OPTION_TYPE_ALERT_TIME, + GF_QUOTA_OPTION_TYPE_SOFT_TIMEOUT, + GF_QUOTA_OPTION_TYPE_HARD_TIMEOUT, + GF_QUOTA_OPTION_TYPE_DEFAULT_SOFT_LIMIT }; enum gf1_cli_friends_list { @@ -107,19 +111,20 @@ enum gf1_cli_top_op { bit-wise operations which reduces complexity */ enum gf_cli_status_type { GF_CLI_STATUS_NONE = 0x0000, - GF_CLI_STATUS_MEM = 0x0001, /*0000000000001*/ - GF_CLI_STATUS_CLIENTS = 0x0002, /*0000000000010*/ - GF_CLI_STATUS_INODE = 0x0004, /*0000000000100*/ - GF_CLI_STATUS_FD = 0x0008, /*0000000001000*/ - GF_CLI_STATUS_CALLPOOL = 0x0010, /*0000000010000*/ - GF_CLI_STATUS_DETAIL = 0x0020, /*0000000100000*/ + GF_CLI_STATUS_MEM = 0x0001, /*00000000000001*/ + GF_CLI_STATUS_CLIENTS = 0x0002, /*00000000000010*/ + GF_CLI_STATUS_INODE = 0x0004, /*00000000000100*/ + GF_CLI_STATUS_FD = 0x0008, /*00000000001000*/ + GF_CLI_STATUS_CALLPOOL = 0x0010, /*00000000010000*/ + GF_CLI_STATUS_DETAIL = 0x0020, /*00000000100000*/ GF_CLI_STATUS_TASKS = 0x0040, /*0000001000000*/ - GF_CLI_STATUS_MASK = 0x00FF, /*0000011111111 Used to get the op*/ - GF_CLI_STATUS_VOL = 0x0100, /*0000100000000*/ - GF_CLI_STATUS_ALL = 0x0200, /*0001000000000*/ - GF_CLI_STATUS_BRICK = 0x0400, /*0010000000000*/ - GF_CLI_STATUS_NFS = 0x0800, /*0100000000000*/ - GF_CLI_STATUS_SHD = 0x1000 /*1000000000000*/ + GF_CLI_STATUS_MASK = 0x00FF, /*00000011111111 Used to get the op*/ + GF_CLI_STATUS_VOL = 0x0100, /*00000100000000*/ + GF_CLI_STATUS_ALL = 0x0200, /*00001000000000*/ + GF_CLI_STATUS_BRICK = 0x0400, /*00010000000000*/ + GF_CLI_STATUS_NFS = 0x0800, /*00100000000000*/ + GF_CLI_STATUS_SHD = 0x1000, /*01000000000000*/ + GF_CLI_STATUS_QUOTAD = 0x2000 /*10000000000000*/ }; struct gf_cli_req { |