diff options
author | vmallika <vmallika@redhat.com> | 2015-04-30 16:50:47 +0530 |
---|---|---|
committer | Vijay Bellur <vbellur@redhat.com> | 2015-05-06 10:48:46 -0700 |
commit | b054985d2f7db9ab72759c988db11feb855a1b5e (patch) | |
tree | 65868f66cd616df79cc3b27c0a014a4c539febe1 /cli | |
parent | e79edf35178f2558d6afb262444294380b76d740 (diff) |
quota/marker: turn off inode quotas by default
inode quota is a new feature implemented in glusterfs-3.7
if quota is enabled in the older version and is upgraded
to a new version, we can hit setxattr spike during self-heal
of inode quotas. So, when a quota is enabled, turn off
inode-quotas with a xlator option.
With this patch, we still account for inode quotas but only
when a write operation is performed for a particular file.
User will be able to query inode quotas once the Inode-quota
xlator option is enabled.
Change-Id: I52fb28bf7024989ce7bb08ac63a303bf3ec1ec9a
BUG: 1209430
Signed-off-by: vmallika <vmallika@redhat.com>
Signed-off-by: Sachin Pandit <spandit@redhat.com>
Reviewed-on: http://review.gluster.org/10152
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'cli')
-rw-r--r-- | cli/src/cli-cmd-parser.c | 54 | ||||
-rw-r--r-- | cli/src/cli-cmd-volume.c | 23 | ||||
-rw-r--r-- | cli/src/cli.h | 3 |
3 files changed, 75 insertions, 5 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index 5437b38d3a6..99ef7014d2d 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -926,6 +926,60 @@ out: } int32_t +cli_cmd_inode_quota_parse (const char **words, int wordcount, dict_t **options) +{ + dict_t *dict = NULL; + char *volname = NULL; + int ret = -1; + + GF_ASSERT (words); + GF_ASSERT (options); + + dict = dict_new (); + if (!dict) { + gf_log ("cli", GF_LOG_ERROR, "dict_new failed"); + goto out; + } + + if (wordcount != 4) + goto out; + + volname = (char *)words[2]; + if (!volname) { + ret = -1; + goto out; + } + + /* Validate the volume name here itself */ + if (cli_validate_volname (volname) < 0) + goto out; + + ret = dict_set_str (dict, "volname", volname); + if (ret < 0) + goto out; + + if (strcmp (words[3], "enable") != 0) { + cli_out ("Invalid quota option : %s", words[3]); + ret = -1; + goto out; + } + + ret = dict_set_int32 (dict, "type", + GF_QUOTA_OPTION_TYPE_ENABLE_OBJECTS); + if (ret < 0) + goto out; + + *options = dict; +out: + if (ret < 0) { + if (dict) + dict_destroy (dict); + } + + return ret; +} + +int32_t cli_cmd_quota_parse (const char **words, int wordcount, dict_t **options) { dict_t *dict = NULL; diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index 9340067e256..0dfb647b92c 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -1515,11 +1515,20 @@ cli_cmd_quota_cbk (struct cli_state *state, struct cli_cmd_word *word, "configuration. Do you want to continue?"; //parse **words into options dictionary - ret = cli_cmd_quota_parse (words, wordcount, &options); - if (ret < 0) { - cli_usage_out (word->pattern); - parse_err = 1; - goto out; + if (strcmp (words[1], "inode-quota") == 0) { + ret = cli_cmd_inode_quota_parse (words, wordcount, &options); + if (ret < 0) { + cli_usage_out (word->pattern); + parse_err = 1; + goto out; + } + } else { + ret = cli_cmd_quota_parse (words, wordcount, &options); + if (ret < 0) { + cli_usage_out (word->pattern); + parse_err = 1; + goto out; + } } ret = dict_get_int32 (options, "type", &type); @@ -2649,6 +2658,10 @@ struct cli_cmd volume_cmds[] = { cli_cmd_quota_cbk, "quota translator specific operations"}, + { "volume inode-quota <VOLNAME> enable", + cli_cmd_quota_cbk, + "quota translator specific operations"}, + { "volume top <VOLNAME> {open|read|write|opendir|readdir|clear} [nfs|brick <brick>] [list-cnt <value>] |\n" "volume top <VOLNAME> {read-perf|write-perf} [bs <size> count <count>] [brick <brick>] [list-cnt <value>]", cli_cmd_volume_top_cbk, diff --git a/cli/src/cli.h b/cli/src/cli.h index 243935230d1..27558a7830c 100644 --- a/cli/src/cli.h +++ b/cli/src/cli.h @@ -242,6 +242,9 @@ int32_t cli_cmd_quota_parse (const char **words, int wordcount, dict_t **opt); int32_t +cli_cmd_inode_quota_parse (const char **words, int wordcount, dict_t **opt); + +int32_t cli_cmd_bitrot_parse (const char **words, int wordcount, dict_t **opt); int32_t |