refactor logcollector memory usage #2637
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
nagworld9
requested review from
narrieta,
kevinclark19a,
ZhidongPeng and
dhivyaganesan
as code owners
nagworld9
commented
Aug 1, 2022
| self.join() | ||
| try: | ||
| self.join() | ||
| except RuntimeError: |
There was a problem hiding this comment.
RuntimeError being raised when agent try to stop the thread to exit gracefully. Seems like expected error ignoring this
File "bin/WALinuxAgent-9.9.9.9-py3.8.egg/azurelinuxagent/ga/collect_logs.py", line 123, in join
self.event_thread.join()
File "/usr/lib/python3.6/threading.py", line 1053, in join
raise RuntimeError("cannot join current thread")
RuntimeError: cannot join current thread
| return LogCollectorMonitorHandler(cgroups) | ||
|
|
||
|
|
||
| class LogCollectorMonitorHandler(ThreadHandlerInterface): |
| max_usage = metric.value | ||
|
|
||
| current_max = max(current_usage, max_usage) | ||
| if current_max > LOGCOLLECTOR_MEMORY_LIMIT: |
There was a problem hiding this comment.
This block checks the memory limit and sends exit
Codecov Report
@@ Coverage Diff @@
## develop #2637 +/- ##
===========================================
+ Coverage 71.91% 72.02% +0.11%
===========================================
Files 103 103
Lines 15654 15745 +91
Branches 2494 2501 +7
===========================================
+ Hits 11258 11341 +83
- Misses 3880 3887 +7
- Partials 516 517 +1
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
narrieta
reviewed
Aug 2, 2022
narrieta
approved these changes
Aug 4, 2022
5 tasks
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.
Description
Problem: The log collector process runs with 30MB of cgroup memory limit. Some vms reported OOM kills of the log collector process when it's reaches the limit.
Solution: Agent monitors the memory every 2 secs in separate thread and gracefully exit the log collector process when it's reaches 30MB limit. That way we can avoid force kills by OOM killer.
Issue #
PR information
Quality of Code and Contribution Guidelines