diff options
author | kshithijiyer <kshithij.ki@gmail.com> | 2019-11-30 15:25:11 +0530 |
---|---|---|
committer | Sunny Kumar <sunkumar@redhat.com> | 2019-12-17 11:33:16 +0000 |
commit | f6e2958543246d547f1c3c3b3b080d435b4c9296 (patch) | |
tree | 06fc16e0381483a29841603e1fc50be089cc83a0 /cli/src | |
parent | ff7865be148d5f4f22861fe93710c0b97d24f81f (diff) | |
download | glusterfs-f6e2958543246d547f1c3c3b3b080d435b4c9296.tar.gz glusterfs-f6e2958543246d547f1c3c3b3b080d435b4c9296.tar.xz glusterfs-f6e2958543246d547f1c3c3b3b080d435b4c9296.zip |
[Cli] Removing old log rotate command.
The old command for log rotate is still present removing
it completely. Also adding testcase to test the
log rotate command with both the old as well as the new command
and fixing testcase which use the old syntax to use the new
one.
Code to be removed:
1. In cli-cmd-volume.c from struct cli_cmd volume_cmds[]:
{"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."},
2. In cli-cmd-volume.c from cli_cmd_log_rotate_cbk():
||(strcmp("rotate", words[2]) == 0)))
3. In cli-cmd-parser.c from cli_cmd_log_rotate_parse()
if (strcmp("rotate", words[2]) == 0)
volname = (char *)words[3];
else
fixes: bz#1750387
Change-Id: I56e4d295044e8d5fd1fc0d848bc87e135e9e32b4
Signed-off-by: kshithijiyer <kshithij.ki@gmail.com>
Diffstat (limited to 'cli/src')
-rw-r--r-- | cli/src/cli-cmd-parser.c | 2 | ||||
-rw-r--r-- | cli/src/cli-cmd-volume.c | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index 73a3cb31f1..4d65d4de87 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -2586,8 +2586,6 @@ cli_cmd_log_rotate_parse(const char **words, int wordcount, dict_t **options) 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 5c53410701..3793e5e8bf 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -2054,8 +2054,7 @@ 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))) { + if (!(strcmp("rotate", words[3]) == 0)) { cli_usage_out(word->pattern); parse_error = 1; goto out; @@ -3085,10 +3084,6 @@ struct cli_cmd volume_cmds[] = { {"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"}, |