summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
diff options
context:
space:
mode:
authorVenky Shankar <vshankar@redhat.com>2013-08-20 13:36:10 +0530
committerAnand Avati <avati@redhat.com>2013-09-04 19:32:12 -0700
commitfc6938613cf12c621d705ceaa8cf695887447d5e (patch)
tree580810fcc17bfeedcee2714afe1fd1fb48bd0749 /xlators/mgmt/glusterd/src/glusterd-brick-ops.c
parent3bfa0dde137f35d68e7f935ddd562136b4829e21 (diff)
glusterd: Allowing root@hostname::slave georep sessions to be created.
non-root@hostname::slave-vol geo-rep sessions are not supported. only hostname and root@hostname sessions are supported, and are treated as the same. Change-Id: I87551e1bd4ff4e0e6520c34eb3d944587cc65476 BUG: 998933 Signed-off-by: Avra Sengupta <asengupt@redhat.com> Signed-off-by: Venky Shankar <vshankar@redhat.com> Reviewed-on: http://review.gluster.org/5659 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-brick-ops.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-brick-ops.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
index 7c8e55bef..c113516c8 100644
--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
@@ -922,6 +922,7 @@ _glusterd_restart_gsync_session (dict_t *this, char *key,
char *slave_vol = NULL;
char *slave_ip = NULL;
char *conf_path = NULL;
+ char **errmsg = NULL;
int ret = -1;
glusterd_gsync_status_temp_t *param = NULL;
gf_boolean_t is_running = _gf_false;
@@ -957,10 +958,13 @@ _glusterd_restart_gsync_session (dict_t *this, char *key,
ret = glusterd_get_slave_details_confpath (param->volinfo,
param->rsp_dict,
&slave_ip, &slave_vol,
- &conf_path);
+ &conf_path, errmsg);
if (ret) {
- gf_log ("", GF_LOG_ERROR,
- "Unable to fetch slave or confpath details.");
+ if (*errmsg)
+ gf_log ("", GF_LOG_ERROR, "%s", *errmsg);
+ else
+ gf_log ("", GF_LOG_ERROR,
+ "Unable to fetch slave or confpath details.");
goto out;
}