Expose memory.use_hierarchy in MemoryStats #1378
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
|
245/252 passed on RHEL - Failed. |
|
@vbatts TRAVIS_COMMIT_RANGE isn't getting set for this PR failing git-validation. What was the workaround for that? |
|
We could do something like this https://github.com/mendersoftware/mendertesting/pull/9/files |
|
@mrunalp let me check on that right now |
vbatts
added a commit
to vbatts/git-validation
that referenced
this pull request
Mar 21, 2017
opencontainers/runc#1378 (comment) points to an alternate approach. Reported-by: Mrunal Patel <[email protected]> Signed-off-by: Vincent Batts <[email protected]>
|
#1382 should fix the issue with travis. |
wking
added a commit
to wking/git-validation
that referenced
this pull request
Mar 21, 2017
Master builds only have a 'git clone ...' [1] so FETCH_HEAD isn't defined and git-validation crashes [2]. This commit partially reverts 8a12a8f (main: default travis commit range is unreliable, 2017-03-21, vbatts#13) to avoid that crash. If TRAVIS_COMMIT_RANGE is unset [3], falling back to TRAVIS_COMMIT may be fine. The ... -> .. replacement works around travis-ci/travis-ci#4596 until that is fixed upstream [4]. This avoids pulling in commits from the base tip that aren't reachable from the head tip (e.g. if master has advanced since the PR branched off, and the PR is against master). We only want to check commits that are in the head branch but not in the base branch (more details on the range syntax in [5]). Once the Travis bug does get fixed, the shell replacement will be a no-op. So we don't have to worry about checks breaking once the bug gets fixed, and can periodically poll the bug and remove the workaround at out leisure after the fix. [1]: https://travis-ci.org/opencontainers/runc/jobs/213508696#L243 [2]: https://travis-ci.org/opencontainers/runc/jobs/213508696#L347 [3]: opencontainers/runc#1378 (comment) [4]: travis-ci/travis-ci#4596 [5]: http://git-scm.com/docs/gitrevisions#_specifying_ranges Signed-off-by: W. Trevor King <[email protected]>
wking
added a commit
to wking/git-validation
that referenced
this pull request
Mar 21, 2017
Master builds only have a 'git clone ...' [1] so FETCH_HEAD isn't defined and git-validation crashes [2]. This commit partially reverts 8a12a8f (main: default travis commit range is unreliable, 2017-03-21, vbatts#13) to avoid that crash. If TRAVIS_COMMIT_RANGE is unset [3], falling back to TRAVIS_COMMIT may be fine. The ... -> .. replacement works around travis-ci/travis-ci#4596 until that is fixed upstream [4]. This avoids pulling in commits from the base tip that aren't reachable from the head tip (e.g. if master has advanced since the PR branched off, and the PR is against master). We only want to check commits that are in the head branch but not in the base branch (more details on the range syntax in [5]). Once the Travis bug does get fixed, the shell replacement will be a no-op. So we don't have to worry about checks breaking once the bug gets fixed, and can periodically poll the bug and remove the workaround at out leisure after the fix. [1]: https://travis-ci.org/opencontainers/runc/jobs/213508696#L243 [2]: https://travis-ci.org/opencontainers/runc/jobs/213508696#L347 [3]: opencontainers/runc#1378 (comment) [4]: travis-ci/travis-ci#4596 [5]: http://git-scm.com/docs/gitrevisions#_specifying_ranges Signed-off-by: W. Trevor King <[email protected]>
derekwaynecarr
force-pushed
the
expose_use_hierarchy
branch
from
ff710f6
to
98f3e51
Compare
|
LGTM |
runcom
reviewed
Mar 22, 2017
libcontainer/cgroups/fs/memory.go
Outdated
| @@ -243,6 +243,14 @@ func (s *MemoryGroup) GetStats(path string, stats *cgroups.Stats) error { | |||
| } | |||
| stats.MemoryStats.KernelTCPUsage = kernelTCPUsage | |||
|
|
|||
| use_hierarchy := strings.Join([]string{"memory", "use_hierarchy"}, ".") | |||
Signed-off-by: Derek Carr <[email protected]>
derekwaynecarr
force-pushed
the
expose_use_hierarchy
branch
from
98f3e51
to
4d6225a
Compare
|
267/275 passed on RHEL - Failed. |
|
LGTM |
|
👍 |
|
LGTM |
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.
Fixes #1376
Signed-off-by: Derek Carr [email protected]