diff options
author | Pranith K <pranithk@gluster.com> | 2010-11-12 04:01:01 +0000 |
---|---|---|
committer | Anand V. Avati <avati@dev.gluster.com> | 2010-11-13 07:02:51 -0800 |
commit | 20fb15dc02a4d1a4b38335a988c0c1abafee7355 (patch) | |
tree | 8503c2df5a758650a7d9f6efcd77bb23e8d585ab /xlators/mgmt/glusterd/src/glusterd3_1-mops.c | |
parent | fe349e42baa47dd7c010707bddbd114946f4d95b (diff) |
mgmt/glusterd: "peer probe new-hostname" should replace old-hostname of friend
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 1995 (Gluster Peer probe command keeps ip address instead of server name in the destination server)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1995
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd3_1-mops.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd3_1-mops.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd3_1-mops.c b/xlators/mgmt/glusterd/src/glusterd3_1-mops.c index 3004954ce..b5ac57194 100644 --- a/xlators/mgmt/glusterd/src/glusterd3_1-mops.c +++ b/xlators/mgmt/glusterd/src/glusterd3_1-mops.c @@ -57,9 +57,7 @@ glusterd3_1_probe_cbk (struct rpc_req *req, struct iovec *iov, int ret = 0; char str[50] = {0,}; glusterd_peerinfo_t *peerinfo = NULL; - glusterd_peerinfo_t *dup_peerinfo = NULL; glusterd_friend_sm_event_t *event = NULL; - glusterd_peer_hostname_t *name = NULL; glusterd_probe_ctx_t *ctx = NULL; conf = THIS->private; @@ -102,18 +100,6 @@ glusterd3_1_probe_cbk (struct rpc_req *req, struct iovec *iov, GF_ASSERT (0); } - if (list_empty (&peerinfo->hostnames)) { - glusterd_friend_find (NULL, rsp.hostname, &dup_peerinfo); - GF_ASSERT (dup_peerinfo); - peerinfo->hostname = gf_strdup (rsp.hostname); - glusterd_peer_hostname_new (rsp.hostname, &name); - list_add_tail (&name->hostname_list, &peerinfo->hostnames); - peerinfo->rpc = dup_peerinfo->rpc; - peerinfo->connected = dup_peerinfo->connected; - glusterd_peer_destroy (dup_peerinfo); - } - if (!peerinfo->hostname) - peerinfo->hostname = gf_strdup (rsp.hostname); uuid_copy (peerinfo->uuid, rsp.uuid); ret = glusterd_friend_sm_new_event |