From 4c012e223f89f9515cd3f8ebec1197ec1594218c Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Sun, 3 Jul 2016 15:51:20 +0530 Subject: glusterd: compare uuid instead of hostname address resolution Backport of http://review.gluster.org/14849 In glusterd_get_brickinfo () brick's hostname is address resolved. This adds an unnecessary latency since it uses calls like getaddrinfo (). Instead given the local brick's uuid is already known a comparison of MY_UUID and brickinfo->uuid is much more light weight than the previous approach. On a scale testing where cluster hosting ~400 volumes spanning across 4 nodes, if a node goes for a reboot, few of the bricks don't come up. After few days of analysis its found that glusterd_pmap_sigin () was taking signficant amount of latency and further code walthrough revealed this unnecessary address resolution. Applying this fix solves the issue and now all the brick processes come up on a node reboot. Backport of commit 633e6fe265bc2de42dade58dc6a15c285957da76: > Change-Id: I299b8660ce0da6f3f739354f5c637bc356d82133 > BUG: 1352279 > Signed-off-by: Atin Mukherjee > Reviewed-on: http://review.gluster.org/14849 > Smoke: Gluster Build System > NetBSD-regression: NetBSD Build System > CentOS-regression: Gluster Build System > Reviewed-by: Prashanth Pai > Reviewed-by: Samikshan Bairagya > Reviewed-by: Kaushal M Change-Id: I299b8660ce0da6f3f739354f5c637bc356d82133 BUG: 1352817 Signed-off-by: Atin Mukherjee Reviewed-on: http://review.gluster.org/14860 NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos Smoke: Gluster Build System --- xlators/mgmt/glusterd/src/glusterd-pmap.c | 6 ++---- xlators/mgmt/glusterd/src/glusterd-utils.c | 4 ++-- xlators/mgmt/glusterd/src/glusterd-utils.h | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.c b/xlators/mgmt/glusterd/src/glusterd-pmap.c index cbc800595ab..192a1d95258 100644 --- a/xlators/mgmt/glusterd/src/glusterd-pmap.c +++ b/xlators/mgmt/glusterd/src/glusterd-pmap.c @@ -416,8 +416,7 @@ __gluster_pmap_signin (rpcsvc_request_t *req) rsp.op_ret = pmap_registry_bind (THIS, args.port, args.brick, GF_PMAP_PORT_BRICKSERVER, req->trans); - ret = glusterd_get_brickinfo (THIS, args.brick, args.port, _gf_true, - &brickinfo); + ret = glusterd_get_brickinfo (THIS, args.brick, args.port, &brickinfo); fail: glusterd_submit_reply (req, &rsp, NULL, 0, NULL, (xdrproc_t)xdr_pmap_signin_rsp); @@ -457,8 +456,7 @@ __gluster_pmap_signout (rpcsvc_request_t *req) rsp.op_ret = pmap_registry_remove (THIS, args.port, args.brick, GF_PMAP_PORT_BRICKSERVER, req->trans); - ret = glusterd_get_brickinfo (THIS, args.brick, args.port, _gf_true, - &brickinfo); + ret = glusterd_get_brickinfo (THIS, args.brick, args.port, &brickinfo); if (args.rdma_port) { snprintf(brick_path, PATH_MAX, "%s.rdma", args.brick); rsp.op_ret = pmap_registry_remove (THIS, args.rdma_port, diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 682a403a45f..d85c8947802 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -5163,7 +5163,7 @@ glusterd_get_dist_leaf_count (glusterd_volinfo_t *volinfo) int glusterd_get_brickinfo (xlator_t *this, const char *brickname, int port, - gf_boolean_t localhost, glusterd_brickinfo_t **brickinfo) + glusterd_brickinfo_t **brickinfo) { glusterd_conf_t *priv = NULL; glusterd_volinfo_t *volinfo = NULL; @@ -5177,7 +5177,7 @@ glusterd_get_brickinfo (xlator_t *this, const char *brickname, int port, cds_list_for_each_entry (volinfo, &priv->volumes, vol_list) { cds_list_for_each_entry (tmpbrkinfo, &volinfo->bricks, brick_list) { - if (localhost && !gf_is_local_addr (tmpbrkinfo->hostname)) + if (gf_uuid_compare (tmpbrkinfo->uuid, MY_UUID)) continue; if (!strcmp(tmpbrkinfo->path, brickname) && (tmpbrkinfo->port == port)) { diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h index 5f4bb6d251b..66db618a08d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.h +++ b/xlators/mgmt/glusterd/src/glusterd-utils.h @@ -206,12 +206,11 @@ glusterd_add_volume_to_dict (glusterd_volinfo_t *volinfo, char *prefix); int glusterd_get_brickinfo (xlator_t *this, const char *brickname, - int port, gf_boolean_t localhost, - glusterd_brickinfo_t **brickinfo); + int port, glusterd_brickinfo_t **brickinfo); void glusterd_set_brick_status (glusterd_brickinfo_t *brickinfo, - gf_brick_status_t status); + gf_brick_status_t status); gf_boolean_t glusterd_is_brick_started (glusterd_brickinfo_t *brickinfo); -- cgit