andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cli: Changed log rotate command format to common format.

Browse Source 
Problem:
The syntax of log rotate was
volume log rotate <volname> [<brick>]
All other commands are of the form:
volume <verb|noun> <volname> [<actions>|options]

Solution:
Changed log rotate command usage to common format.
Old syntax is also supported, it will be deprecated
in next release.

Change-Id: Ia6f6665185a1549c6f79ca763599b446f29e2c78
BUG: 844187
Signed-off-by: Raghavendra Talur <rtalur@redhat.com>
Reviewed-on: http://review.gluster.org/4594
Reviewed-by: Kaushal M <kaushal@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
This commit is contained in:
Raghavendra Talur 2013-02-28 14:41:52 +05:30 committed by Anand Avati
parent 1fbffa0aa4
commit a193f2262b
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/src/cli-cmd-parser.c
View File

@ -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);

14
cli/src/cli-cmd-volume.c
View File

@ -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"},