diff options
Diffstat (limited to 'xlators')
-rw-r--r-- | xlators/debug/io-stats/src/io-stats.c | 22 | ||||
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 7 |
2 files changed, 20 insertions, 9 deletions
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c index f12191fb8df..13545bdaa3b 100644 --- a/xlators/debug/io-stats/src/io-stats.c +++ b/xlators/debug/io-stats/src/io-stats.c @@ -3704,19 +3704,23 @@ xlator_set_loglevel(xlator_t *this, int log_level) active = ctx->active; top = active->first; - if (strcmp(top->type, "protocol/server") || (log_level == -1)) + if (log_level == -1) return; - /* Set log-level for server xlator */ - top->loglevel = log_level; + if (ctx->cmd_args.brick_mux) { + /* Set log-level for all brick xlators */ + top->loglevel = log_level; - /* Set log-level for parent xlator */ - if (this->parents) - this->parents->xlator->loglevel = log_level; + /* Set log-level for parent xlator */ + if (this->parents) + this->parents->xlator->loglevel = log_level; - while (trav) { - trav->loglevel = log_level; - trav = trav->next; + while (trav) { + trav->loglevel = log_level; + trav = trav->next; + } + } else { + gf_log_set_loglevel(this->ctx, log_level); } } diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 8bbd795c6ab..e6f2d3d3f3c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -2229,6 +2229,9 @@ retry: if (volinfo->memory_accounting) runner_add_arg(&runner, "--mem-accounting"); + if (is_brick_mx_enabled()) + runner_add_arg(&runner, "--brick-mux"); + runner_log(&runner, "", 0, "Starting GlusterFS"); brickinfo->port = port; @@ -2367,6 +2370,10 @@ unsafe_option(dict_t *this, char *key, data_t *value, void *arg) return _gf_false; } + if (fnmatch("*diagnostics.client-log*", key, 0) == 0) { + return _gf_false; + } + return _gf_true; } |