diff options
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 5 | ||||
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index 7a2ff026d88..1513e0c5ef5 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -1605,7 +1605,10 @@ cli_cmd_log_rotate_parse (const char **words, int wordcount, dict_t **options) if (!dict) goto out; - volname = (char *)words[3]; + if (strcmp ("rotate", words[3]) == 0) + volname = (char *)words[2]; + else if (strcmp ("rotate", words[2]) == 0) + volname = (char *)words[3]; GF_ASSERT (volname); ret = dict_set_str (dict, "volname", volname); diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index fc3b7229a21..8d80aaeb3cc 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -1691,6 +1691,13 @@ cli_cmd_log_rotate_cbk (struct cli_state *state, struct cli_cmd_word *word, goto out; } + if (!((strcmp ("rotate", words[2]) == 0) || + (strcmp ("rotate", words[3]) == 0))) { + cli_usage_out (word->pattern); + parse_error = 1; + goto out; + } + proc = &cli_rpc_prog->proctable[GLUSTER_CLI_LOG_ROTATE]; frame = create_frame (THIS, THIS->ctx->pool); @@ -2316,10 +2323,15 @@ struct cli_cmd volume_cmds[] = { cli_cmd_volume_help_cbk, "display help for the volume command"}, - { "volume log rotate <VOLNAME> [BRICK]", + { "volume log <VOLNAME> rotate [BRICK]", cli_cmd_log_rotate_cbk, "rotate the log file for corresponding volume/brick"}, + { "volume log rotate <VOLNAME> [BRICK]", + cli_cmd_log_rotate_cbk, + "rotate the log file for corresponding volume/brick" + " NOTE: This is an old syntax, will be deprecated from next release."}, + { "volume sync <HOSTNAME> [all|<VOLNAME>]", cli_cmd_sync_volume_cbk, "sync the volume information from a peer"}, |