Expose total_rss when hierarchy is enabled #1728
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
derekwaynecarr
changed the title
|
I need to test this in a kube context to make sure it works as expected for our summary api. |
derekwaynecarr
changed the title
|
ok, i think this is fine. |
derekwaynecarr
force-pushed
the
total-rss
branch
from
d7f16a5
to
6fa48d9
Compare
openshift-merge-robot
added a commit
to openshift/origin
that referenced
this pull request
Sep 19, 2017
Automatic merge from submit-queue cadvisor/runc updates Support CRI-O: google/cadvisor#1741 Fix memory stats: google/cadvisor#1728 opencontainers/runc#1378 @derekwaynecarr
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.
If hierarchy is enabled, we should return total_rss instead of rss when reporting container stats.
This is a follow-up to previously reported issue in kubernetes here:
kubernetes/kubernetes#43399 (comment)
/cc @sjenning @dashpole @vishh @smarterclayton