summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-handler.c
diff options
context:
space:
mode:
authorPranith K <pranithk@gluster.com>2011-03-04 02:41:35 +0000
committerAnand V. Avati <avati@dev.gluster.com>2011-03-04 10:04:38 -0800
commit135aca330b0429776125bdd98be4ccd85dcfa715 (patch)
tree766d07ccf8781ebf430cfb83bb305fc531a3350c /xlators/mgmt/glusterd/src/glusterd-handler.c
parent5b909c83de45e9457eef773cb24770b47d51a632 (diff)
mgmt/glusterd: Handle race in peer connect and reverse probev3.1.3qa4
Signed-off-by: Pranith Kumar K <pranithk@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 2486 ([glusterfs-3.1.3qa2]: Core generated due to SegFault in glusterd_sm.c) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2486
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-handler.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index 68cdb6fc3a7..3856de86fc7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -2862,9 +2862,9 @@ glusterd_handle_probe_query (rpcsvc_request_t *req)
} else if (ret) {
gf_log ("glusterd", GF_LOG_NORMAL, "Unable to find peerinfo"
" for host: %s (%d)", remote_hostname, port);
- args.mode = GD_MODE_SWITCH_ON;
+ args.mode = GD_MODE_ON;
ret = glusterd_friend_add (remote_hostname, port,
- GD_FRIEND_STATE_DEFAULT,
+ GD_FRIEND_STATE_PROBE_RCVD,
NULL, NULL, &peerinfo, 0, &args);
if (ret) {
gf_log ("", GF_LOG_ERROR, "Failed to add peer %s",