14f8ab
From 5b3fcc8db86b4dc7af1eb63315ca2ff41c60fdea Mon Sep 17 00:00:00 2001
14f8ab
From: kshithijiyer <kshithij.ki@gmail.com>
14f8ab
Date: Sat, 30 Nov 2019 15:25:11 +0530
14f8ab
Subject: [PATCH 395/449] [Cli] Removing old log rotate command.
14f8ab
14f8ab
The old command for log rotate is still present removing
14f8ab
it completely. Also adding testcase to test the
14f8ab
log rotate command with both the old as well as the new command
14f8ab
and fixing testcase which use the old syntax to use the new
14f8ab
one.
14f8ab
14f8ab
Code to be removed:
14f8ab
1. In cli-cmd-volume.c from struct cli_cmd volume_cmds[]:
14f8ab
{"volume log rotate <VOLNAME> [BRICK]", cli_cmd_log_rotate_cbk,
14f8ab
 "rotate the log file for corresponding volume/brick"
14f8ab
 " NOTE: This is an old syntax, will be deprecated from next release."},
14f8ab
14f8ab
2. In cli-cmd-volume.c from cli_cmd_log_rotate_cbk():
14f8ab
 ||(strcmp("rotate", words[2]) == 0)))
14f8ab
14f8ab
3. In cli-cmd-parser.c from cli_cmd_log_rotate_parse()
14f8ab
if (strcmp("rotate", words[2]) == 0)
14f8ab
   volname = (char *)words[3];
14f8ab
else
14f8ab
14f8ab
> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/23392/
14f8ab
> fixes: bz#1750387
14f8ab
> Change-Id: I56e4d295044e8d5fd1fc0d848bc87e135e9e32b4
14f8ab
> Signed-off-by: kshithijiyer <kshithij.ki@gmail.com>
14f8ab
14f8ab
BUG: 1784415
14f8ab
Change-Id: I56e4d295044e8d5fd1fc0d848bc87e135e9e32b4
14f8ab
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
14f8ab
Reviewed-on: https://code.engineering.redhat.com/gerrit/202334
14f8ab
Tested-by: RHGS Build Bot <nigelb@redhat.com>
14f8ab
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
14f8ab
---
14f8ab
 cli/src/cli-cmd-parser.c                        | 2 --
14f8ab
 cli/src/cli-cmd-volume.c                        | 7 +------
14f8ab
 tests/bugs/glusterd/optimized-basic-testcases.t | 3 ++-
14f8ab
 tests/bugs/glusterfs-server/bug-852147.t        | 2 +-
14f8ab
 4 files changed, 4 insertions(+), 10 deletions(-)
14f8ab
14f8ab
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
14f8ab
index 4456a7b..ac0a263 100644
14f8ab
--- a/cli/src/cli-cmd-parser.c
14f8ab
+++ b/cli/src/cli-cmd-parser.c
14f8ab
@@ -2592,8 +2592,6 @@ cli_cmd_log_rotate_parse(const char **words, int wordcount, dict_t **options)
14f8ab
 
14f8ab
     if (strcmp("rotate", words[3]) == 0)
14f8ab
         volname = (char *)words[2];
14f8ab
-    else if (strcmp("rotate", words[2]) == 0)
14f8ab
-        volname = (char *)words[3];
14f8ab
     GF_ASSERT(volname);
14f8ab
 
14f8ab
     ret = dict_set_str(dict, "volname", volname);
14f8ab
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
14f8ab
index 754d333..f33fc99 100644
14f8ab
--- a/cli/src/cli-cmd-volume.c
14f8ab
+++ b/cli/src/cli-cmd-volume.c
14f8ab
@@ -2349,8 +2349,7 @@ cli_cmd_log_rotate_cbk(struct cli_state *state, struct cli_cmd_word *word,
14f8ab
         goto out;
14f8ab
     }
14f8ab
 
14f8ab
-    if (!((strcmp("rotate", words[2]) == 0) ||
14f8ab
-          (strcmp("rotate", words[3]) == 0))) {
14f8ab
+    if (!(strcmp("rotate", words[3]) == 0)) {
14f8ab
         cli_usage_out(word->pattern);
14f8ab
         parse_error = 1;
14f8ab
         goto out;
14f8ab
@@ -3401,10 +3400,6 @@ struct cli_cmd volume_cmds[] = {
14f8ab
     {"volume log <VOLNAME> rotate [BRICK]", cli_cmd_log_rotate_cbk,
14f8ab
      "rotate the log file for corresponding volume/brick"},
14f8ab
 
14f8ab
-    {"volume log rotate <VOLNAME> [BRICK]", cli_cmd_log_rotate_cbk,
14f8ab
-     "rotate the log file for corresponding volume/brick"
14f8ab
-     " NOTE: This is an old syntax, will be deprecated from next release."},
14f8ab
-
14f8ab
     {"volume sync <HOSTNAME> [all|<VOLNAME>]", cli_cmd_sync_volume_cbk,
14f8ab
      "sync the volume information from a peer"},
14f8ab
 
14f8ab
diff --git a/tests/bugs/glusterd/optimized-basic-testcases.t b/tests/bugs/glusterd/optimized-basic-testcases.t
14f8ab
index c7e8c32..862f329 100644
14f8ab
--- a/tests/bugs/glusterd/optimized-basic-testcases.t
14f8ab
+++ b/tests/bugs/glusterd/optimized-basic-testcases.t
14f8ab
@@ -129,7 +129,8 @@ TEST ! $CLI volume set all $V0 cluster.op-version $OP_VERS_NEW
14f8ab
 
14f8ab
 #bug-1022055 - validate log rotate command
14f8ab
 
14f8ab
-TEST $CLI volume log rotate $V0;
14f8ab
+TEST ! $CLI volume log rotate $V0;
14f8ab
+TEST $CLI volume log $V0 rotate;
14f8ab
 
14f8ab
 #bug-1092841 - validating barrier enable/disable
14f8ab
 
14f8ab
diff --git a/tests/bugs/glusterfs-server/bug-852147.t b/tests/bugs/glusterfs-server/bug-852147.t
14f8ab
index c644cfa..75db2a2 100755
14f8ab
--- a/tests/bugs/glusterfs-server/bug-852147.t
14f8ab
+++ b/tests/bugs/glusterfs-server/bug-852147.t
14f8ab
@@ -66,7 +66,7 @@ ren_file=$log_file".*"
14f8ab
 rm -rf $ren_file
14f8ab
 
14f8ab
 #Initiating log rotate
14f8ab
-TEST $CLI volume log rotate $V0
14f8ab
+TEST $CLI volume log $V0 rotate
14f8ab
 
14f8ab
 #Capturing new log file's size
14f8ab
 new_file_size=`file-size $log_file`
14f8ab
-- 
14f8ab
1.8.3.1
14f8ab