From 0dfe24fc9fc8bf92044fa59e27f61169dfdcd5bc Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Fri, 15 Apr 2011 00:58:00 +0000 Subject: 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 Signed-off-by: Anand Avati BUG: 2757 (refactory gsync/gsyncd/syncdaemon/whatever to geo-replication) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2757 --- cli/src/cli-cmd-parser.c | 2 +- cli/src/cli-cmd-volume.c | 4 +- cli/src/cli-rpc-ops.c | 10 +-- libglusterfs/src/common-utils.h | 1 + xlators/features/marker/src/marker.c | 96 ++++++++++++++-------------- xlators/features/marker/src/marker.h | 2 +- xlators/mgmt/glusterd/src/glusterd-handler.c | 10 +-- xlators/mgmt/glusterd/src/glusterd-op-sm.c | 64 +++++++++---------- xlators/mgmt/glusterd/src/glusterd-op-sm.h | 2 +- xlators/mgmt/glusterd/src/glusterd-store.c | 4 +- xlators/mgmt/glusterd/src/glusterd-volgen.c | 2 +- xlators/mgmt/glusterd/src/glusterd-volgen.h | 2 +- xlators/mgmt/glusterd/src/glusterd.c | 4 +- 13 files changed, 101 insertions(+), 102 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 [options]", + {"volume "GEOREP" [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 diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h index eb3e121779d..a1df3de3524 100644 --- a/libglusterfs/src/common-utils.h +++ b/libglusterfs/src/common-utils.h @@ -68,6 +68,7 @@ void trap (void); #define GF_UNIT_TB_STRING "TB" #define GF_UNIT_PB_STRING "PB" +#define GEOREP "geo-replication" enum _gf_boolean { diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index 074ee5762b3..7622642e746 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -284,7 +284,7 @@ marker_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, priv = this->private; - if (priv == NULL || (priv->feature_enabled & GF_GSYNC) == 0) + if (priv == NULL || (priv->feature_enabled & GF_XTIME) == 0) goto wind; gf_log (this->name, GF_LOG_DEBUG, "USER:PID = %d", frame->root->pid); @@ -423,7 +423,7 @@ marker_create_frame (xlator_t *this, marker_local_t *local) } int32_t -marker_gsync_update_marks (xlator_t *this, marker_local_t *local) +marker_xtime_update_marks (xlator_t *this, marker_local_t *local) { marker_gettimeofday (local); @@ -464,8 +464,8 @@ marker_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (priv->feature_enabled & GF_QUOTA) quota_set_inode_xattr (this, &local->loc); - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -535,8 +535,8 @@ marker_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (priv->feature_enabled & GF_QUOTA) quota_set_inode_xattr (this, &local->loc); - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -604,8 +604,8 @@ marker_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (priv->feature_enabled & GF_QUOTA) initiate_quota_txn (this, &local->loc); - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -679,8 +679,8 @@ marker_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (priv->feature_enabled & GF_QUOTA) reduce_parent_size (this, &local->loc); - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -746,8 +746,8 @@ marker_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (priv->feature_enabled & GF_QUOTA) reduce_parent_size (this, &local->loc); - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -814,8 +814,8 @@ marker_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (priv->feature_enabled & GF_QUOTA) initiate_quota_txn (this, &local->loc); - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -889,10 +889,10 @@ marker_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this, oplocal->loc.inode); } - if (priv->feature_enabled & GF_GSYNC) { + if (priv->feature_enabled & GF_XTIME) { //update marks on oldpath - marker_gsync_update_marks (this, oplocal); - marker_gsync_update_marks (this, local); + marker_xtime_update_marks (this, oplocal); + marker_xtime_update_marks (this, local); } out: marker_local_unref (local); @@ -973,8 +973,8 @@ marker_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (priv->feature_enabled & GF_QUOTA) initiate_quota_txn (this, &local->loc); - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -1041,8 +1041,8 @@ marker_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (priv->feature_enabled & GF_QUOTA) initiate_quota_txn (this, &local->loc); - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -1109,8 +1109,8 @@ marker_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (priv->feature_enabled & GF_QUOTA) initiate_quota_txn (this, &local->loc); - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -1175,8 +1175,8 @@ marker_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this, priv = this->private; - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -1299,8 +1299,8 @@ marker_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, priv = this->private; - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -1366,8 +1366,8 @@ marker_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, priv = this->private; - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -1435,8 +1435,8 @@ marker_fsetattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, priv = this->private; - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -1503,8 +1503,8 @@ marker_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, priv = this->private; - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -1566,8 +1566,8 @@ marker_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, priv = this->private; - if (priv->feature_enabled & GF_GSYNC) - marker_gsync_update_marks (this, local); + if (priv->feature_enabled & GF_XTIME) + marker_xtime_update_marks (this, local); out: marker_local_unref (local); @@ -1695,7 +1695,7 @@ mem_acct_init (xlator_t *this) int32_t -init_gsync_priv (xlator_t *this, dict_t *options) +init_xtime_priv (xlator_t *this, dict_t *options) { data_t *data = NULL; int32_t ret = -1; @@ -1762,7 +1762,7 @@ out: } void -marker_gsync_priv_cleanup (xlator_t *this) +marker_xtime_priv_cleanup (xlator_t *this) { marker_conf_t *priv = NULL; @@ -1795,7 +1795,7 @@ marker_priv_cleanup (xlator_t *this) GF_VALIDATE_OR_GOTO (this->name, priv, out); - marker_gsync_priv_cleanup (this); + marker_xtime_priv_cleanup (this); GF_FREE (priv); out: @@ -1833,19 +1833,19 @@ reconfigure (xlator_t *this, dict_t *options) } } - data = dict_get (options, "gsync"); + data = dict_get (options, "xtime"); if (data) { ret = gf_string2boolean (data->data, &flag); if (ret == 0 && flag == _gf_true) { - marker_gsync_priv_cleanup (this); + marker_xtime_priv_cleanup (this); - ret = init_gsync_priv (this, options); + ret = init_xtime_priv (this, options); if (ret < 0) { gf_log (this->name, GF_LOG_WARNING, - "failed to initialize gsync private, " - "gsync xtime updation will fail"); + "failed to initialize xtime private, " + "xtime updation will fail"); } else { - priv->feature_enabled |= GF_GSYNC; + priv->feature_enabled |= GF_XTIME; } } } @@ -1895,15 +1895,15 @@ init (xlator_t *this) } } - data = dict_get (options, "gsync"); + data = dict_get (options, "xtime"); if (data) { ret = gf_string2boolean (data->data, &flag); if (ret == 0 && flag == _gf_true) { - ret = init_gsync_priv (this, options); + ret = init_xtime_priv (this, options); if (ret < 0) goto err; - priv->feature_enabled |= GF_GSYNC; + priv->feature_enabled |= GF_XTIME; } } @@ -1970,6 +1970,6 @@ struct volume_options options[] = { {.key = {"volume-uuid"}}, {.key = {"timestamp-file"}}, {.key = {"quota"}}, - {.key = {"gsync"}}, + {.key = {"xtime"}}, {.key = {NULL}} }; diff --git a/xlators/features/marker/src/marker.h b/xlators/features/marker/src/marker.h index 5602456ff5d..090e2621040 100644 --- a/xlators/features/marker/src/marker.h +++ b/xlators/features/marker/src/marker.h @@ -37,7 +37,7 @@ enum { GF_QUOTA=1, - GF_GSYNC=2 + GF_XTIME=2 }; /*initialize the local variable*/ diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 95da3d00816..f4f2e0a2bef 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -1724,21 +1724,21 @@ glusterd_handle_gsync_set (rpcsvc_request_t *req) ret = dict_get_str (dict, "master", &master); if (ret < 0) { gf_log ("", GF_LOG_INFO, "master not found, while handling" - "gsync options"); + GEOREP" options"); master = "(No Master)"; } ret = dict_get_str (dict, "slave", &slave); if (ret < 0) { gf_log ("", GF_LOG_INFO, "slave not not found, while" - "handling gsync options"); + "handling "GEOREP" options"); slave = "(No Slave)"; } ret = dict_get_int32 (dict, "type", &type); if (ret < 0) { gf_log ("", GF_LOG_WARNING, "command type not found, while" - "handling gsync options"); + "handling "GEOREP" options"); goto out; } @@ -1761,10 +1761,10 @@ glusterd_handle_gsync_set (rpcsvc_request_t *req) break; } - gf_cmd_log ("volume gsync", " %s command on %s,%s", operation, master, + gf_cmd_log ("volume "GEOREP, " %s command on %s,%s", operation, master, slave); ret = glusterd_op_begin (req, GD_OP_GSYNC_SET, dict, _gf_true); - gf_cmd_log ("volume gsync", " %s command on %s,%s %s ", operation, + gf_cmd_log ("volume "GEOREP, " %s command on %s,%s %s ", operation, master, slave, (ret != 0)? "FAILED" : "SUCCEEDED"); out: diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 6e358821b3e..9719526a691 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -537,12 +537,12 @@ glusterd_op_stage_stop_volume (dict_t *dict, char **op_errstr) ret = glusterd_check_gsync_running (volinfo, &is_run); if (ret && (is_run == _gf_false)) gf_log ("", GF_LOG_WARNING, "Unable to get the status" - " of active gsync session"); + " of active "GEOREP" session"); if (is_run) { - gf_log ("", GF_LOG_WARNING, "Gsync sessions active" + gf_log ("", GF_LOG_WARNING, GEOREP" sessions active" "for the volume %s ", volname); - snprintf (msg, sizeof(msg), "Gsync sessions are active " - "for the volume '%s'.\nUse 'volume gsync " + snprintf (msg, sizeof(msg), GEOREP" sessions are active " + "for the volume '%s'.\nUse 'volume "GEOREP" " "status' command for more info. Use 'force'" "option to ignore and stop stop the volume", volname); @@ -1801,7 +1801,7 @@ glusterd_gsync_get_param_file (char *prmfile, const char *ext, char *master, 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; @@ -1850,7 +1850,7 @@ glusterd_gsync_get_pid_file (char *pidfile, char *master, char *slave) ptr = fgets(buff, sizeof(buff), in); if (ptr) { buff[strlen(buff)-1]='\0'; //strip off \n - snprintf (buffer, PATH_MAX, "%s/gsync/%s", priv->workdir, buff); + snprintf (buffer, PATH_MAX, "%s/"GEOREP"/%s", priv->workdir, buff); strncpy (pidfolder, buffer, PATH_MAX); } else { ret = -1; @@ -2230,7 +2230,7 @@ glusterd_check_gsync_running_local (char *master, char *slave, if (ret == 0 && ret_status == 0) { *is_run = _gf_true; } else if (ret == -1) { - gf_log ("", GF_LOG_WARNING, "gsync start validation " + gf_log ("", GF_LOG_WARNING, GEOREP" start validation " " failed"); goto out; } @@ -2263,11 +2263,11 @@ glusterd_store_slave_in_info (glusterd_volinfo_t *volinfo, char *master, dict_foreach (volinfo->gsync_slaves, _compare_host_uuid, &status); if (status.ret_status == -1) { - gf_log ("", GF_LOG_ERROR, "Gsync has already been invoked for " + gf_log ("", GF_LOG_ERROR, GEOREP" has already been invoked for " "the %s (master) and %s (slave)" "from a different machine", master, slave); - *op_errstr = gf_strdup ("Gsync already running in an an" + *op_errstr = gf_strdup (GEOREP" already running in an an" "orhter machine"); ret = -1; goto out; @@ -2320,7 +2320,7 @@ glusterd_op_verify_gsync_start_options (glusterd_volinfo_t *volinfo, if (GLUSTERD_STATUS_STARTED != volinfo->status) { snprintf (msg, sizeof (msg), "Volume %s needs to be started " - "before gsync start", volinfo->volname); + "before "GEOREP" start", volinfo->volname); goto out; } /*Check if the gsync is already started in cmd. inited host @@ -2330,12 +2330,12 @@ glusterd_op_verify_gsync_start_options (glusterd_volinfo_t *volinfo, ret = glusterd_check_gsync_running_local (master, slave, &is_running); if (ret) { - snprintf (msg, sizeof (msg), "gsync start option " + snprintf (msg, sizeof (msg), GEOREP" start option " "validation failed "); goto out; } if (_gf_true == is_running) { - snprintf (msg, sizeof (msg), "gsync %s %s already " + snprintf (msg, sizeof (msg), GEOREP" %s %s already " "started", master, slave); ret = -1; goto out; @@ -2385,12 +2385,13 @@ glusterd_op_verify_gsync_running (glusterd_volinfo_t *volinfo, if (GLUSTERD_STATUS_STARTED != volinfo->status) { snprintf (msg, sizeof (msg), "Volume %s needs to be started " - "before gsync start", volinfo->volname); + "before "GEOREP" start", volinfo->volname); + goto out; } ret = glusterd_gsync_get_uuid (master, slave, volinfo, uuid); if (ret == -1) { - snprintf (msg, sizeof (msg), "Gsync session is not active"); + snprintf (msg, sizeof (msg), GEOREP" session is not active"); goto out; } @@ -4175,11 +4176,11 @@ stop_gsync (char *master, char *slave, char **op_errstr) ret = gsync_status (master, slave, &status); if (ret == 0 && status == -1) { - gf_log ("", GF_LOG_WARNING, "Gsync is not running"); - *op_errstr = gf_strdup ("Gsync is not running"); + gf_log ("", GF_LOG_WARNING, "gsyncd is not running"); + *op_errstr = gf_strdup ("gsyncd is not running"); goto out; } else if (ret == -1) { - gf_log ("", GF_LOG_WARNING, "gsync stop validation " + gf_log ("", GF_LOG_WARNING, GEOREP" stop validation " " failed"); *op_errstr = gf_strdup ("command to failed, please " "check the log file"); @@ -4209,7 +4210,7 @@ stop_gsync (char *master, char *slave, char **op_errstr) ret = kill (-pid, SIGTERM); if (ret) { gf_log ("", GF_LOG_WARNING, - "failed to stop gsyncd"); + "failed to kill gsyncd"); goto out; } for (i = 0; i < 20; i++) { @@ -4229,7 +4230,7 @@ stop_gsync (char *master, char *slave, char **op_errstr) } ret = 0; - *op_errstr = gf_strdup ("gsync stopped successfully"); + *op_errstr = gf_strdup (GEOREP" stopped successfully"); out: return ret; @@ -4247,7 +4248,7 @@ gsync_config_set (char *master, char *slave, if (THIS == NULL) { gf_log ("", GF_LOG_ERROR, "THIS of glusterd not present"); - *op_errstr = gf_strdup ("Error! Glusterd cannot start gsyncd"); + *op_errstr = gf_strdup ("Error! Glusterd cannot start "GEOREP); goto out; } @@ -4255,7 +4256,7 @@ gsync_config_set (char *master, char *slave, if (priv == NULL) { gf_log ("", GF_LOG_ERROR, "priv of glusterd not present"); - *op_errstr = gf_strdup ("Error! Glusterd cannot start gsyncd"); + *op_errstr = gf_strdup ("Error! Glusterd cannot start "GEOREP); goto out; } @@ -4322,7 +4323,7 @@ gsync_config_del (char *master, char *slave, if (THIS == NULL) { gf_log ("", GF_LOG_ERROR, "THIS of glusterd not present"); - *op_errstr = gf_strdup ("Error! Glusterd cannot start gsyncd"); + *op_errstr = gf_strdup ("Error! Glusterd cannot start "GEOREP); goto out; } @@ -4330,7 +4331,7 @@ gsync_config_del (char *master, char *slave, if (priv == NULL) { gf_log ("", GF_LOG_ERROR, "priv of glusterd not present"); - *op_errstr = gf_strdup ("Error! Glusterd cannot start gsyncd"); + *op_errstr = gf_strdup ("Error! Glusterd cannot start "GEOREP); goto out; } @@ -4383,13 +4384,13 @@ glusterd_gsync_read_frm_status (char *path, char *data) GF_ASSERT (data); status_file = fopen (path, "r"); if (status_file == NULL) { - gf_log ("", GF_LOG_WARNING, "Unable to read the Gsync status" + gf_log ("", GF_LOG_WARNING, "Unable to read gsyncd status" " file"); return -1; } ret = fread (data, PATH_MAX, 1, status_file); if (ret < 0) { - gf_log ("", GF_LOG_WARNING, "Status file of Gsync is corrupt"); + gf_log ("", GF_LOG_WARNING, "Status file of gsyncd is corrupt"); return -1; } @@ -4427,11 +4428,8 @@ glusterd_read_status_file (char *master, char *slave, if (ret == 0 && status == -1) { strncpy (buff, "Corrupt\n", sizeof (buff)); goto done; - } else if (ret == -1) { - gf_log ("", GF_LOG_WARNING, "Unable to determine " - " Gsync's status"); + } else if (ret == -1) goto out; - } ret = glusterd_gsync_read_frm_status (statusfile, buff); if (ret) { @@ -4520,7 +4518,7 @@ glusterd_marker_create_volfile (glusterd_volinfo_t *volinfo) ret = glusterd_create_volfiles_and_notify_services (volinfo); if (ret) { gf_log ("", GF_LOG_ERROR, "Unable to create volfile" - " for setting of marker while 'gsync start'"); + " for setting of marker while '"GEOREP" start'"); ret = -1; goto out; } @@ -4785,7 +4783,7 @@ glusterd_op_gsync_set (dict_t *dict, char **op_errstr, dict_t *rsp_dict) ret = glusterd_set_marker_gsync (master); if (ret != 0) { gf_log ("", GF_LOG_WARNING, "marker start failed"); - *op_errstr = gf_strdup ("gsync start failed"); + *op_errstr = gf_strdup ("failed to initialize indexing"); ret = -1; goto out; } @@ -4801,9 +4799,9 @@ glusterd_op_gsync_set (dict_t *dict, char **op_errstr, dict_t *rsp_dict) ret = glusterd_gsync_get_uuid (master, slave, volinfo, uuid); if (ret) { - gf_log ("", GF_LOG_WARNING, "Gsync is not runing for" + gf_log ("", GF_LOG_WARNING, GEOREP" is not set up for" "%s(master) and %s(slave)", master, slave); - *op_errstr = strdup ("Gsync is not running"); + *op_errstr = strdup (GEOREP" is not set up"); goto out; } diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.h b/xlators/mgmt/glusterd/src/glusterd-op-sm.h index 399d9a5c919..52e36ed3a71 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.h +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.h @@ -26,7 +26,7 @@ #endif #ifndef GSYNC_CONF -#define GSYNC_CONF "gsync/gsyncd.conf" +#define GSYNC_CONF GEOREP"/gsyncd.conf" #endif #include diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index 836c9d12cf5..d31110156ef 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -1523,8 +1523,8 @@ glusterd_store_retrieve_volume (char *volname) "dict_set_str"); goto out; } - gf_log ("", GF_LOG_DEBUG, "Parsed as Gsync-" - "skave:key=%s,value:%s", key, value); + gf_log ("", GF_LOG_DEBUG, "Parsed as "GEOREP" " + " slave:key=%s,value:%s", key, value); } else { exists = glusterd_check_option_exists (key, NULL); diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 6b5653be42b..fd3b4792c77 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -154,7 +154,7 @@ static struct volopt_map_entry glusterd_volopt_map[] = { {"performance.quick-read", "performance/quick-read", "!perf", "on", NO_DOC, 0}, {VKEY_PERF_STAT_PREFETCH, "performance/stat-prefetch", "!perf", "on", NO_DOC, 0}, - {VKEY_MARKER_XTIME, "features/marker", "gsync", "off", NO_DOC, OPT_FLAG_FORCE}, + {VKEY_MARKER_XTIME, "features/marker", "xtime", "off", NO_DOC, OPT_FLAG_FORCE}, {"nfs.enable-ino32", "nfs/server", "nfs.enable-ino32", NULL, GLOBAL_DOC, 0}, {"nfs.mem-factor", "nfs/server", "nfs.mem-factor", NULL, GLOBAL_DOC, 0}, diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.h b/xlators/mgmt/glusterd/src/glusterd-volgen.h index 9e90b413019..518ae94ad8c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.h +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.h @@ -32,7 +32,7 @@ #define VKEY_DIAG_CNT_FOP_HITS "diagnostics.count-fop-hits" #define VKEY_DIAG_LAT_MEASUREMENT "diagnostics.latency-measurement" #define VKEY_FEATURES_LIMIT_USAGE "features.limit-usage" -#define VKEY_MARKER_XTIME "features.marker-gsync" +#define VKEY_MARKER_XTIME GEOREP".indexing" #define VKEY_FEATURES_QUOTA "features.quota" #define VKEY_PERF_STAT_PREFETCH "performance.stat-prefetch" diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index 7d20d6c5ea2..a0b654fc721 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -238,11 +238,11 @@ configure_syncaemon (xlator_t *this, const char *workdir) char cmd[4096] = {0,}; int blen = 0; - snprintf (voldir, PATH_MAX, "%s/gsync", workdir); + snprintf (voldir, PATH_MAX, "%s/"GEOREP, workdir); ret = mkdir (voldir, 0777); if ((-1 == ret) && (errno != EEXIST)) { gf_log (this->name, GF_LOG_CRITICAL, - "Unable to create gsync directory %s (%s)", + "Unable to create "GEOREP" directory %s (%s)", voldir, strerror (errno)); return -1; } -- cgit