diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2017-01-31 14:49:45 -0500 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-02-01 19:54:58 -0500 |
| commit | 83803b4b2d70e9e6e16bb050d7ac8e49ba420893 (patch) | |
| tree | 9a6c1f3f9a723bf578f78c624d3ce9f44baac6db /glusterfsd/src/glusterfsd.c | |
| parent | 80b04666ec7019e132f76f734a88559457702f1b (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.
Backport of:
> Change-Id: I45059454e51d6f4cbb29a4953359c09a408695cb
> BUG: 1385758
> Reviewed-on: https://review.gluster.org/14763
Change-Id: I4bce9080f6c93d50171823298fdf920258317ee8
BUG: 1418091
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: https://review.gluster.org/16496
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: Shyamsundar Ranganathan <srangana@redhat.com>
Diffstat (limited to 'glusterfsd/src/glusterfsd.c')
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 5f7a4dc6f36..1f7b63e7594 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -2317,7 +2317,12 @@ glusterfs_process_volfp (glusterfs_ctx_t *ctx, FILE *fp) } } - ret = glusterfs_graph_prepare (graph, ctx); + xlator_t *xl = graph->first; + if (strcmp (xl->type, "protocol/server") == 0) { + (void) copy_opts_to_child (xl, FIRST_CHILD (xl), "*auth*"); + } + + ret = glusterfs_graph_prepare (graph, ctx, ctx->cmd_args.volume_name); if (ret) { goto out; } @@ -2479,7 +2484,7 @@ main (int argc, char *argv[]) goto out; } - /* do this _after_ deamonize() */ + /* do this _after_ daemonize() */ if (cmd->global_timer_wheel) { ret = glusterfs_global_timer_wheel_init (ctx); if (ret) |