[dockerutil] cpu subsys will be mistaken for cpuacct, this fixes that. #2829
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
| @@ -279,7 +279,7 @@ def find_cgroup_from_proc(cls, mountpoints, pid, subsys, docker_root='/'): | |||
| if subsys in subsystems: | |||
| for mountpoint in mountpoints.itervalues(): | |||
| stat_file_path = os.path.join(mountpoint, subsystems[subsys]) | |||
| if subsys in mountpoint and os.path.exists(stat_file_path): | |||
| if subsys == mountpoint.split('/')[-1] and os.path.exists(stat_file_path): | |||
There was a problem hiding this comment.
good catch, you saved us hours of wondering why the metrics don't match! 🍪
|
LGTM |
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.
What does this PR do?
If we attempt to grab metrics from the
cpusubsystem as is the case with thethrottledmetric introduced here #2724, we will currently fail to identify the correctcpu.statfile because thecpusubsystem will be mistaken for thecpuacctsubsystem or similar. This PR attempts to address the issue for this and future metrics.Also fixes badly indented function.
Motivation
Found the bug while testing #2724.
Testing Guidelines
An overview on testing
is available in our contribution guidelines.
Additional Notes
Anything else we should know when reviewing?