diff options
| author | hari gowtham <hgowtham@redhat.com> | 2015-11-02 15:21:19 +0530 | 
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-11-03 11:39:13 -0800 | 
| commit | 10730517a8e51e155c57e22b32c3809d942143df (patch) | |
| tree | 963c89730c67885b1c2a4868952e442ef07d8350 | |
| parent | 499b43058049572e33b525ac669ef623d476fe41 (diff) | |
correction of message displayed after attach tier
the message after attach tier is saying rebalance.
It is changed according to tiering.
Change-Id: I1834511f86483fa60f404d7defe5be59c025e9d6
BUG: 1277081
Signed-off-by: hari gowtham <hgowtham@redhat.com>
Reviewed-on: http://review.gluster.org/12488
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 46 | 
1 files changed, 36 insertions, 10 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 9c42356b594..41efde80312 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -1740,12 +1740,25 @@ gf_cli_defrag_volume_cbk (struct rpc_req *req, struct iovec *iov,                                   * case since unlock failures can be highlighted                                   * event though rebalance command was successful                                   */ -                                snprintf (msg, sizeof (msg), -                                          "Rebalance on %s has been started " -                                          "successfully. Use rebalance status " -                                          "command to check status of the " -                                          "rebalance process.\nID: %s\n%s", -                                          volname, task_id_str, rsp.op_errstr); + +                                 if (cmd == GF_DEFRAG_CMD_START_TIER) { +                                         snprintf (msg, sizeof (msg), +                                                  "Attach tier is successful " +                                                  "on %s. use tier status to " +                                                  "check the status.\nID: %s" +                                                  "\n%s", +                                                  volname, task_id_str, +                                                  rsp.op_errstr); +                                 } else { +                                         snprintf (msg, sizeof (msg), +                                                  "Rebalance on %s has been " +                                                  "started successfully. Use " +                                                  "rebalance status command to" +                                                  " check status of the " +                                                  "rebalance process.\nID: %s\n%s", +                                                  volname, task_id_str, +                                                  rsp.op_errstr); +                                 }                           } else {                                  snprintf (msg, sizeof (msg),                                            "Starting rebalance on volume %s has " @@ -1818,11 +1831,24 @@ done:                                      rsp.op_errstr);          else {                  if (rsp.op_ret) -                        cli_err ("volume rebalance: %s: failed%s%s", -                                 volname, strlen (msg) ? ": " : "", msg); + +                        if (cmd == GF_DEFRAG_CMD_START_TIER) { +                                cli_err ("Tiering Migration Functionality: %s:" +                                         " failed%s%s", volname, +                                         strlen (msg) ? ": " : "", msg); +                        } else +                                cli_err ("volume rebalance: %s: failed%s%s", +                                         volname, strlen (msg) ? ": " : "", +                                         msg);                  else -                        cli_out ("volume rebalance: %s: success%s%s", -                                 volname, strlen (msg) ? ": " : "", msg); +                        if (cmd == GF_DEFRAG_CMD_START_TIER) { +                                cli_out ("Tiering Migration Functionality: %s:" +                                         " success%s%s", volname, +                                         strlen (msg) ? ": " : "", msg); +                        } else +                                cli_out ("volume rebalance: %s: success%s%s", +                                         volname, strlen (msg) ? ": " : "", +                                         msg);          }          ret = rsp.op_ret;  | 
