diff options
| author | Kaushik BV <kaushikbv@gluster.com> | 2011-04-18 02:09:00 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-04-18 04:31:52 -0700 |
| commit | 2f9ce3f4fd23d1a9256e84830805a62f1ebe76fb (patch) | |
| tree | b530ca2980e0af929628ab9917ed9fdd8cb3591c | |
| parent | 67705d888c4e038f188da8a21ade8db447cd7009 (diff) | |
mgmt/glusterd: change the cli output of geo-rep start/stop to resemble the output of volume start/stop
Signed-off-by: Kaushik BV <kaushikbv@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 1570 (geosync related changes)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 6 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index aa6d80f37..e7e92eaa9 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -2721,11 +2721,13 @@ gf_cli3_1_gsync_set_cbk (struct rpc_req *req, struct iovec *iov, switch (rsp.type) { case GF_GSYNC_OPTION_TYPE_START: - cli_out (GEOREP" session started Successfully"); + cli_out ("Starting " GEOREP " session between %s & %s" + " has been successful", rsp.master, rsp.slave); break; case GF_GSYNC_OPTION_TYPE_STOP: - cli_out (GEOREP" session stopped successfully"); + cli_out ("Stopping " GEOREP " session between %s & %s" + " has been successful", rsp.master, rsp.slave); break; case GF_GSYNC_OPTION_TYPE_CONFIGURE: diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index e02d9aecb..2d78449b0 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -2252,8 +2252,9 @@ glusterd_op_verify_gsync_start_options (glusterd_volinfo_t *volinfo, goto out; } if (_gf_true == is_running) { - snprintf (msg, sizeof (msg), GEOREP" %s %s already " - "started", volinfo->volname, slave); + snprintf (msg, sizeof (msg), GEOREP " session between" + " %s & %s already started", volinfo->volname, + slave); ret = -1; goto out; } @@ -2306,7 +2307,8 @@ glusterd_op_verify_gsync_running (glusterd_volinfo_t *volinfo, } ret = glusterd_gsync_get_uuid (slave, volinfo, uuid); if (ret == -1) { - snprintf (msg, sizeof (msg), GEOREP" session is not active"); + snprintf (msg, sizeof (msg), GEOREP" session between %s & %s" + " not active", volinfo->volname, slave); goto out; } |