diff options
author | Mohit Agrawal <moagrawal@redhat.com> | 2019-04-04 09:56:11 +0530 |
---|---|---|
committer | Atin Mukherjee <amukherj@redhat.com> | 2019-04-15 04:30:43 +0000 |
commit | 798aadbe51a9a02dd98a0f861cc239ecf7c8ed57 (patch) | |
tree | 492c9d756bdacfbeb7db8f0ce975d33c99e01097 /xlators/mgmt/glusterd/src/glusterd-utils.c | |
parent | a67929e18a39d5c79a4a7e2b78015523626a367e (diff) |
core: Log level changes do not effect on running client process
Problem: commit c34e4161f3cb6539ec83a9020f3d27eb4759a975 set log-level
per xlator during reconfigure only for a brick process not for
the client process.
Solution: 1) Change per xlator log-level only if brick_mux is enabled.To make sure
about brick multiplex introudce a flag brick_mux at ctx->cmd_args.
Note: There are two other changes done with this patch
1) Ignore client-log-level option to attach a brick with
already running brick if brick_mux is enabled
2) Add a log to print pid of the running process to make easier
debugging
Change-Id: I39e85de778e150d0685cd9a79425ce8b4783f9c9
Signed-off-by: Mohit Agrawal <moagrawal@redhat.com>
Fixes: bz#1696046
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 87914c4799c..50534852d8d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -2161,6 +2161,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; @@ -2299,6 +2302,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; } |