From 401d591de168fdb648663f01c4c4f8ed60777558 Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Garg Date: Wed, 13 Apr 2016 14:38:11 +0530 Subject: Revert "glusterd: Allocate fresh port on brick (re)start" This reverts commit 34899d7 Commit 34899d7 introduced a change, where restarting a volume or rebooting a node result into fresh allocation of brick port. In production environment generally administrator makes firewall configuration for a range of ports for a volume. With commit 34899d7, on rebooting of node or restarting a volume might result into volume start fail because firewall might block fresh allocated port of a brick and also it will be difficult in testing because of fresh allocation of port. Change-Id: I7a90f69e8c267a013dc906b5228ca76e819d84ad BUG: 1322805 Signed-off-by: Gaurav Kumar Garg Reviewed-on: http://review.gluster.org/13989 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Atin Mukherjee --- xlators/mgmt/glusterd/src/glusterd-messages.h | 10 +------ xlators/mgmt/glusterd/src/glusterd-store.c | 16 +++++++++++ xlators/mgmt/glusterd/src/glusterd-utils.c | 38 +++++---------------------- 3 files changed, 23 insertions(+), 41 deletions(-) (limited to 'xlators/mgmt') diff --git a/xlators/mgmt/glusterd/src/glusterd-messages.h b/xlators/mgmt/glusterd/src/glusterd-messages.h index 04d630001df..ffcfa7773e9 100644 --- a/xlators/mgmt/glusterd/src/glusterd-messages.h +++ b/xlators/mgmt/glusterd/src/glusterd-messages.h @@ -41,7 +41,7 @@ #define GLUSTERD_COMP_BASE GLFS_MSGID_GLUSTERD -#define GLFS_NUM_MESSAGES 574 +#define GLFS_NUM_MESSAGES 573 #define GLFS_MSGID_END (GLUSTERD_COMP_BASE + GLFS_NUM_MESSAGES + 1) /* Messaged with message IDs */ @@ -4633,14 +4633,6 @@ */ #define GD_MSG_SNAP_RESUME_TIER_FAIL (GLUSTERD_COMP_BASE + 573) -/*! - * @messageid - * @diagnosis - * @recommendedaction - * - */ -#define GD_MSG_PMAP_REMOVE_FAIL (GLUSTERD_COMP_BASE + 574) - /*------------*/ #define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages" #endif /* !_GLUSTERD_MESSAGES_H_ */ diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index 592a2952c4b..605c4c2519f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -2313,6 +2313,13 @@ glusterd_store_retrieve_bricks (glusterd_volinfo_t *volinfo) /* This is required to adhere to the IANA standards */ brickinfo->port = 0; + } else { + /* This is required to have proper ports + assigned to bricks after restart */ + pmap = pmap_registry_get (THIS); + if (pmap->last_alloc <= brickinfo->port) + pmap->last_alloc = + brickinfo->port + 1; } } else if (!strncmp (key, GLUSTERD_STORE_KEY_BRICK_RDMA_PORT, strlen (GLUSTERD_STORE_KEY_BRICK_RDMA_PORT))) { @@ -2322,7 +2329,16 @@ glusterd_store_retrieve_bricks (glusterd_volinfo_t *volinfo) /* This is required to adhere to the IANA standards */ brickinfo->rdma_port = 0; + } else { + /* This is required to have proper ports + assigned to bricks after restart */ + pmap = pmap_registry_get (THIS); + if (pmap->last_alloc <= + brickinfo->rdma_port) + pmap->last_alloc = + brickinfo->rdma_port +1; } + } else if (!strncmp (key, GLUSTERD_STORE_KEY_BRICK_DECOMMISSIONED, strlen (GLUSTERD_STORE_KEY_BRICK_DECOMMISSIONED))) { gf_string2int (value, &brickinfo->decommissioned); diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 66054794fd7..ba0539febd4 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -1730,22 +1730,9 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo, if (gf_is_service_running (pidfile, NULL)) goto connect; - /* Do a pmap registry remove on the older connected port */ - if (brickinfo->port) { - ret = pmap_registry_remove (this, brickinfo->port, - brickinfo->path, - GF_PMAP_PORT_BRICKSERVER, - NULL); - if (ret) { - gf_msg (this->name, GF_LOG_ERROR, 0, - GD_MSG_PMAP_REMOVE_FAIL, "Failed to remove pmap" - "registry for older signin port %d", - brickinfo->port); - goto out; - } - } - - port = pmap_registry_alloc (THIS); + port = brickinfo->port; + if (!port) + port = pmap_registry_alloc (THIS); /* Build the exp_path, before starting the glusterfsd even in valgrind mode. Otherwise all the glusterfsd processes start @@ -1808,22 +1795,9 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo, if (volinfo->transport_type != GF_TRANSPORT_BOTH_TCP_RDMA) { runner_argprintf (&runner, "%d", port); } else { - /* Do a pmap registry remove on the older connected port */ - if (brickinfo->rdma_port) { - ret = pmap_registry_remove (this, brickinfo->rdma_port, - brickinfo->path, - GF_PMAP_PORT_BRICKSERVER, - NULL); - if (ret) { - gf_msg (this->name, GF_LOG_ERROR, 0, - GD_MSG_PMAP_REMOVE_FAIL, "Failed to " - "remove pmap registry for older signin " - "port %d", brickinfo->rdma_port); - goto out; - } - } - rdma_port = pmap_registry_alloc (THIS); - + rdma_port = brickinfo->rdma_port; + if (!rdma_port) + rdma_port = pmap_registry_alloc (THIS); runner_argprintf (&runner, "%d,%d", port, rdma_port); runner_add_arg (&runner, "--xlator-option"); runner_argprintf (&runner, "%s-server.transport.rdma.listen-port=%d", -- cgit