Fix system config using double memory #496
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| end | ||
| end | ||
|
|
||
| # TODO: this method should be moved to SystemConfig class method | ||
| def apply_system_config(opt) | ||
| # Create NULL file to avoid $log uninitialized problem before call @log.init |
There was a problem hiding this comment.
Removed this trick. Now, read_config and apply_system_config uses the default (or commad line option arguments) log_level on starting up. After the system_config is applied, the log_level is changed.
sonots
changed the title
sonots
force-pushed
the
fix_system_config
branch
2 times, most recently
from
96bfef4 to
a3b5797
Compare
sonots
force-pushed
the
fix_system_config
branch
from
18b4c20 to
bb6c0bd
Compare
sonots
changed the title
|
Verified this code works well by running on my production environment. |
| opt.merge!(SystemConfig.new(systems.first).to_opt) | ||
| ensure | ||
| file.close | ||
| SystemConfig.new(systems.first).apply(self) |
|
#497 provides new plugin instantiation approach. |
|
It seems ok. @tagomoris Do you see any concern? |
|
No problem. |
sonots
added a commit
that referenced
this pull request
Dec 3, 2014
Fix system config using double memory
sonots
added a commit
that referenced
this pull request
Dec 3, 2014
Fix system config using double memory
|
Changes Unknown when pulling bb6c0bd on fix_system_config into * on master*. |
ganmacs
added a commit
to ganmacs/fluentd
that referenced
this pull request
Oct 15, 2019
since fluent#496 Signed-off-by: Yuta Iwama <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The current code calls
read_configtwice on the parent (supervisor) process and the child (main) process. Because the member variable@config_datais overwritten in the child process, the memory usage for@config_databecomes double. This causes a problem on an environment whose conf file is large like 10,000 lines.Commenting out this line
fluentd/lib/fluent/supervisor.rb
Line 108 in 50a90ac
This patch fixes the problem without removing the system config feature.