From 83803b4b2d70e9e6e16bb050d7ac8e49ba420893 Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Tue, 31 Jan 2017 14:49:45 -0500 Subject: core: run many bricks within one glusterfsd process This patch adds support for multiple brick translator stacks running in a single brick server process. This reduces our per-brick memory usage by approximately 3x, and our appetite for TCP ports even more. It also creates potential to avoid process/thread thrashing, and to improve QoS by scheduling more carefully across the bricks, but realizing that potential will require further work. Multiplexing is controlled by the "cluster.brick-multiplex" global option. By default it's off, and bricks are started in separate processes as before. If multiplexing is enabled, then *compatible* bricks (mostly those with the same transport options) will be started in the same process. Backport of: > Change-Id: I45059454e51d6f4cbb29a4953359c09a408695cb > BUG: 1385758 > Reviewed-on: https://review.gluster.org/14763 Change-Id: I4bce9080f6c93d50171823298fdf920258317ee8 BUG: 1418091 Signed-off-by: Jeff Darcy Reviewed-on: https://review.gluster.org/16496 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Shyamsundar Ranganathan --- rpc/rpc-lib/src/protocol-common.h | 1 + rpc/rpc-lib/src/rpc-clnt.h | 1 - rpc/rpc-transport/socket/src/socket.c | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'rpc') diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h index 89a7bb0bcde..cd21ad8564f 100644 --- a/rpc/rpc-lib/src/protocol-common.h +++ b/rpc/rpc-lib/src/protocol-common.h @@ -233,6 +233,7 @@ enum glusterd_brick_procnum { GLUSTERD_VOLUME_BARRIER_OP, GLUSTERD_BRICK_BARRIER, GLUSTERD_NODE_BITROT, + GLUSTERD_BRICK_ATTACH, GLUSTERD_BRICK_MAXVALUE, }; diff --git a/rpc/rpc-lib/src/rpc-clnt.h b/rpc/rpc-lib/src/rpc-clnt.h index 3a5b287cd49..4d66498a0aa 100644 --- a/rpc/rpc-lib/src/rpc-clnt.h +++ b/rpc/rpc-lib/src/rpc-clnt.h @@ -28,7 +28,6 @@ typedef enum { #define SFRAME_GET_PROGVER(sframe) (sframe->rpcreq->prog->progver) #define SFRAME_GET_PROCNUM(sframe) (sframe->rpcreq->procnum) -struct xptr_clnt; struct rpc_req; struct rpc_clnt; struct rpc_clnt_config; diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index d05dc4189aa..e214c772aa6 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -731,8 +731,6 @@ __socket_disconnect (rpc_transport_t *this) * Without this, reconnect (= disconnect + connect) * won't work except by accident. */ - sys_close (priv->sock); - priv->sock = -1; gf_log (this->name, GF_LOG_TRACE, "OT_PLEASE_DIE on %p", this); priv->ot_state = OT_PLEASE_DIE; -- cgit