diff options
| author | Csaba Henk <csaba@gluster.com> | 2011-04-15 00:58:00 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-04-15 00:31:08 -0700 |
| commit | 0dfe24fc9fc8bf92044fa59e27f61169dfdcd5bc (patch) | |
| tree | 5992e7d61300446d944bd10da3f606a63d5d0871 /cli | |
| parent | e1be6195464836dd910e3b62f518c897dd06740d (diff) | |
use "geo-replication" all over as the official name of this feature
Use GEOREP macro if you want to refer to the feature in code.
Signed-off-by: Csaba Henk <csaba@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 2757 (refactory gsync/gsyncd/syncdaemon/whatever to geo-replication)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2757
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 2 | ||||
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 4 | ||||
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index e8b0e778ae6..7ddeb511c25 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -1133,7 +1133,7 @@ cli_cmd_gsync_set_parse (const char **words, int wordcount, dict_t **options) GF_ASSERT (options); GF_ASSERT ((strcmp (words[0], "volume")) == 0); - GF_ASSERT ((strcmp (words[1], "gsync")) == 0); + GF_ASSERT ((strcmp (words[1], GEOREP)) == 0); dict = dict_new (); if (!dict) diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index 41533cf5c9f..9dc70d2ea79 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -1086,7 +1086,7 @@ out: dict_unref (options); if (ret && parse_err == 0) - cli_out ("Gsync command failed"); + cli_out (GEOREP" start failed"); return ret; } @@ -1165,7 +1165,7 @@ struct cli_cmd volume_cmds[] = { "reset all the reconfigured options"}, #if (SYNCDAEMON_COMPILE) - {"volume gsync <start|stop|config> <MASTER> <SLAVE> [options]", + {"volume "GEOREP" <start|stop|config> <MASTER> <SLAVE> [options]", cli_cmd_volume_gsync_set_cbk, "Geo-sync operations"}, #endif diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 9a2bb87f14e..215a48e2d11 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -24,7 +24,7 @@ #endif #ifndef GSYNC_CONF -#define GSYNC_CONF "gsync/gsyncd.conf" +#define GSYNC_CONF GEOREP"/gsyncd.conf" #endif #define DEFAULT_LOG_FILE_DIRECTORY DATADIR "/log/glusterfs" @@ -2653,7 +2653,7 @@ gf_cli3_1_gsync_get_param_file (char *prmfile, const char *ext, char *master, ch ptr = fgets(buff, sizeof(buff), in); if (ptr) { buff[strlen(buff)-1]='\0'; //strip off \n - snprintf (prmfolder, PATH_MAX, "%s/gsync/%s", gl_workdir, buff); + snprintf (prmfolder, PATH_MAX, "%s/"GEOREP"/%s", gl_workdir, buff); } else { ret = -1; goto out; @@ -2691,12 +2691,12 @@ gf_cli3_1_gsync_out_status (dict_t *dict) ret = dict_get_int32 (dict, "gsync-count", &gsync_count); if (ret) { - cli_out ("No Gsync sessions for the selected"); + cli_out ("No "GEOREP" sessions for the selected"); ret = 0; goto out; } - cli_out ("Gsync Status:"); + cli_out (GEOREP" Status:"); for (i = 1; i <= gsync_count; i++) { snprintf (mst, sizeof(mst), "master%d", i); @@ -2802,7 +2802,7 @@ gf_cli3_1_gsync_set_cbk (struct rpc_req *req, struct iovec *iov, else if (rsp.type == GF_GSYNC_OPTION_TYPE_STATUS) ret = gf_cli3_1_gsync_out_status (dict); else if (rsp.type == GF_GSYNC_OPTION_TYPE_STOP) - cli_out ("Gsync session stopped successfully"); + cli_out (GEOREP" session stopped successfully"); else if (!rsp.op_errstr) cli_out ("command executed successfully"); else |