diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2016-12-08 16:24:15 -0500 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2017-01-30 19:13:58 -0500 |
| commit | 1a95fc3036db51b82b6a80952f0908bc2019d24a (patch) | |
| tree | b983ac196a8165d5cb5e860a5ef97d3e9a41b5c9 /xlators/mgmt/glusterd/src/glusterd.h | |
| parent | 7f7d7a939e46b330a084d974451eee4757ba61b4 (diff) | |
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.
Change-Id: I45059454e51d6f4cbb29a4953359c09a408695cb
BUG: 1385758
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: https://review.gluster.org/14763
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd.h')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index d00e4e20811..f3c7e1d6891 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -54,6 +54,7 @@ "S32gluster_enable_shared_storage.sh" #define GLUSTER_SHARED_STORAGE "gluster_shared_storage" #define GLUSTERD_SHARED_STORAGE_KEY "cluster.enable-shared-storage" +#define GLUSTERD_BRICK_MULTIPLEX_KEY "cluster.brick-multiplex" #define GANESHA_HA_CONF CONFDIR "/ganesha-ha.conf" #define GANESHA_EXPORT_DIRECTORY CONFDIR"/exports" @@ -77,7 +78,6 @@ "for more details." #define OPERRSTR_COMMIT_FAIL "Commit failed on %s. Please check the log file "\ "for more details." - struct glusterd_volinfo_; typedef struct glusterd_volinfo_ glusterd_volinfo_t; @@ -215,7 +215,6 @@ struct glusterd_brickinfo { int port; int rdma_port; char *logfile; - gf_boolean_t signed_in; gf_store_handle_t *shandle; gf_brick_status_t status; struct rpc_clnt *rpc; @@ -232,6 +231,7 @@ struct glusterd_brickinfo { */ uint16_t group; uuid_t jbr_uuid; + gf_boolean_t started_here; }; typedef struct glusterd_brickinfo glusterd_brickinfo_t; @@ -1048,7 +1048,8 @@ glusterd_brick_rpc_notify (struct rpc_clnt *rpc, void *mydata, int glusterd_rpc_create (struct rpc_clnt **rpc, dict_t *options, - rpc_clnt_notify_t notify_fn, void *notify_data); + rpc_clnt_notify_t notify_fn, void *notify_data, + gf_boolean_t force); /* handler functions */ @@ -1064,8 +1065,7 @@ int glusterd_handle_defrag_start (glusterd_volinfo_t *volinfo, char *op_errstr, size_t len, int cmd, defrag_cbk_fn_t cbk, glusterd_op_t op); int -glusterd_rebalance_rpc_create (glusterd_volinfo_t *volinfo, - gf_boolean_t reconnect); +glusterd_rebalance_rpc_create (glusterd_volinfo_t *volinfo); int glusterd_rebalance_defrag_init (glusterd_volinfo_t *volinfo, defrag_cbk_fn_t cbk); |