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 /xlators/cluster | |
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 'xlators/cluster')
-rw-r--r-- | xlators/cluster/afr/src/afr.c | 7 | ||||
-rw-r--r-- | xlators/cluster/ec/src/ec.c | 19 |
2 files changed, 16 insertions, 10 deletions
diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c index 1df45b5a68f..ceaa034dbbb 100644 --- a/xlators/cluster/afr/src/afr.c +++ b/xlators/cluster/afr/src/afr.c @@ -89,6 +89,10 @@ static void fix_quorum_options (xlator_t *this, afr_private_t *priv, char *qtype, dict_t *options) { + + gf_log (this->name, GF_LOG_INFO, + "reindeer: incoming qtype = %s", qtype); + if (dict_get (options, "quorum-type") == NULL) { /* If user doesn't configure anything enable auto-quorum if the * replica has more than two subvolumes */ @@ -107,6 +111,9 @@ fix_quorum_options (xlator_t *this, afr_private_t *priv, char *qtype, } else if (!strcmp (qtype, "auto")) { priv->quorum_count = AFR_QUORUM_AUTO; } + + gf_log (this->name, GF_LOG_INFO, + "reindeer: quorum_count = %d", priv->quorum_count); } int diff --git a/xlators/cluster/ec/src/ec.c b/xlators/cluster/ec/src/ec.c index 4d550176f19..7b16f8fd255 100644 --- a/xlators/cluster/ec/src/ec.c +++ b/xlators/cluster/ec/src/ec.c @@ -419,12 +419,11 @@ ec_launch_notify_timer (xlator_t *this, ec_t *ec) void ec_handle_up (xlator_t *this, ec_t *ec, int32_t idx) { - if (((ec->xl_notify >> idx) & 1) == 0) { - ec->xl_notify |= 1ULL << idx; - ec->xl_notify_count++; - } - if (((ec->xl_up >> idx) & 1) == 0) { /* Duplicate event */ + if (((ec->xl_notify >> idx) & 1) == 0) { + ec->xl_notify |= 1ULL << idx; + ec->xl_notify_count++; + } ec->xl_up |= 1ULL << idx; ec->xl_up_count++; } @@ -433,14 +432,14 @@ ec_handle_up (xlator_t *this, ec_t *ec, int32_t idx) void ec_handle_down (xlator_t *this, ec_t *ec, int32_t idx) { - if (((ec->xl_notify >> idx) & 1) == 0) { - ec->xl_notify |= 1ULL << idx; - ec->xl_notify_count++; - } - if (((ec->xl_up >> idx) & 1) != 0) { /* Duplicate event */ gf_msg_debug (this->name, 0, "Child %d is DOWN", idx); + if (((ec->xl_notify >> idx) & 1) == 0) { + ec->xl_notify |= 1ULL << idx; + ec->xl_notify_count++; + } + ec->xl_up ^= 1ULL << idx; ec->xl_up_count--; } |