jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1722 from ravisantoshgudimetla/fix-systemd-path 

fix systemd slice expansion so that it could be consumed by cAdvisor
This commit is contained in:
Michael Crosby 2018-02-20 09:59:24 -05:00 committed by GitHub
parent 6988afe05d 7019e1de7b
commit 595bea022f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcontainer/cgroups/systemd/apply_systemd.go
View File

@ -395,7 +395,7 @@ func joinCgroups(c *configs.Cgroup, pid int) error {
// systemd represents slice hierarchy using `-`, so we need to follow suit when // systemd represents slice hierarchy using `-`, so we need to follow suit when
// generating the path of slice. Essentially, test-a-b.slice becomes // generating the path of slice. Essentially, test-a-b.slice becomes
// test.slice/test-a.slice/test-a-b.slice. // /test.slice/test-a.slice/test-a-b.slice.
func ExpandSlice(slice string) (string, error) { func ExpandSlice(slice string) (string, error) {
suffix := ".slice" suffix := ".slice"
// Name has to end with ".slice", but can't be just ".slice". // Name has to end with ".slice", but can't be just ".slice".
@ -421,10 +421,9 @@ func ExpandSlice(slice string) (string, error) {
} }
// Append the component to the path and to the prefix. // Append the component to the path and to the prefix.
path += prefix + component + suffix + "/" path += "/" + prefix + component + suffix
prefix += component + "-" prefix += component + "-"
} }
return path, nil return path, nil
} }