From e1fa3dacf83e0f16aae0888b4c9e96a1497ac74c Mon Sep 17 00:00:00 2001
From: kshithijiyer <kshithij.ki@gmail.com>
Date: Sat, 30 Nov 2019 15:25:11 +0530
Subject: 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>
---
 cli/src/cli-cmd-parser.c                        | 2 --
 cli/src/cli-cmd-volume.c                        | 7 +------
 tests/bugs/glusterd/optimized-basic-testcases.t | 3 ++-
 tests/bugs/glusterfs-server/bug-852147.t        | 2 +-
 4 files changed, 4 insertions(+), 10 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"},
 
diff --git a/tests/bugs/glusterd/optimized-basic-testcases.t b/tests/bugs/glusterd/optimized-basic-testcases.t
index 7b73b1e86e..6fdb463e5d 100644
--- a/tests/bugs/glusterd/optimized-basic-testcases.t
+++ b/tests/bugs/glusterd/optimized-basic-testcases.t
@@ -124,7 +124,8 @@ TEST ! $CLI volume set all $V0 cluster.op-version $OP_VERS_NEW
 
 #bug-1022055 - validate log rotate command
 
-TEST $CLI volume log rotate $V0;
+TEST ! $CLI volume log rotate $V0;
+TEST $CLI volume log $V0 rotate;
 
 #bug-1092841 - validating barrier enable/disable
 
diff --git a/tests/bugs/glusterfs-server/bug-852147.t b/tests/bugs/glusterfs-server/bug-852147.t
index c644cfa62d..75db2a26e0 100755
--- a/tests/bugs/glusterfs-server/bug-852147.t
+++ b/tests/bugs/glusterfs-server/bug-852147.t
@@ -66,7 +66,7 @@ ren_file=$log_file".*"
 rm -rf $ren_file
 
 #Initiating log rotate
-TEST $CLI volume log rotate $V0
+TEST $CLI volume log $V0 rotate
 
 #Capturing new log file's size
 new_file_size=`file-size $log_file`
-- 
cgit