fix systemd slice expansion so that it could be consumed by cAdvisor#1722
Merged
crosbymichael merged 1 commit intoopencontainers:masterfrom Feb 20, 2018
Merged
Conversation
35b3942 to
e13985d
Compare
Signed-off-by: ravisantoshgudimetla <ravisantoshgudimetla@gmail.com>
e13985d to
7019e1d
Compare
Contributor
|
Hold on this. It doesn't seem to address the upstream issue kubernetes/kubernetes#59993 (comment) |
Contributor
|
Nevemind kubernetes/kubernetes#59993 (comment) Also |
Contributor
|
cc @mrunalp |
Contributor
|
not that I have any privileges but LGTM |
Member
|
LGTM. |
Member
|
LGTM |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
As of now systemd slice expansion would result in strings with a suffix "/" but we want "/" to be prefixed in kubernetes so that cAdvisor can read stats.
The only call to ExpandSlice function in runc seems to be happening from
https://github.com/opencontainers/runc/blob/master/libcontainer/cgroups/systemd/apply_systemd.go#L449
which uses filepath.Join, so shouldn't cause a behavioural change.
xref: kubernetes/kubernetes#59993
/cc @derekwaynecarr @sjenning
Signed-off-by: ravisantoshgudimetla ravisantoshgudimetla@gmail.com