diff options
author | Atin Mukherjee <amukherj@redhat.com> | 2016-02-25 14:42:48 +0530 |
---|---|---|
committer | Jeff Darcy <jdarcy@redhat.com> | 2016-03-24 08:09:02 -0700 |
commit | 43652d54591e13234e1556e563866f7ecc2b56d6 (patch) | |
tree | cbdc1dfa3bcd3c6a7a778e21bbd5563bd8f3ec79 /xlators/mgmt/glusterd/src/glusterd-handler.c | |
parent | 10d7b9d45a90d345f6ce4ec0e7192e0226602d80 (diff) |
glusterd: reject peer probe from a reinstalled node
Backport of http://review.gluster.org/13519
In a cluster if a node (say N1) goes through a OS reinstallation then probing
some other node in the cluster from N1 doesn't fail as in
gd_validate_mgmt_hndsk_req () uuid & hostname checks are done separately but
there should be one more check where both the conditions should meet.
Steps to create the problem
- N1 probes N2
- bring down glusterd instance on N2
- remove /var/lib/glusterd/* from N2
- restart glusterd instance on N2
- execute gluster peer probe N1 from N2
Validations in gd_validate_mgmt_hndsk_req () has been improved to handle this
special case
Change-Id: I3ba5d8e243bae07a7a6743d01b019e7014d39171
BUG: 1315147
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: http://review.gluster.org/13519
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: http://review.gluster.org/13619
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-handler.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index e2bf485e4e2..43fa98e1f6e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -3839,7 +3839,8 @@ glusterd_xfer_friend_add_resp (rpcsvc_request_t *req, char *myhostname, gf_msg ("glusterd", GF_LOG_INFO, 0, GD_MSG_RESPONSE_INFO, - "Responded to %s (%d), ret: %d", remote_hostname, port, ret); + "Responded to %s (%d), ret: %d, op_ret: %d", remote_hostname, + port, ret, op_ret); GF_FREE (rsp.hostname); return ret; } |