toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #31827 from erikstmartin/master

Browse Source 
Add mount point to cgroup root when initializing cgroup paths for cpu.rt_runtime
Upstream-commit: b0235fd515eb25eebb9395f87044fbd11b864b75
Component: engine
This commit is contained in:
Vincent Demeester
2017-04-03 22:39:49 +02:00
committed by GitHub
parent 8b68d758b1 42ac777ed3
commit 235108e14b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/daemon_unix.go
+7 -2
View File
@@ -1269,12 +1269,17 @@ func (daemon *Daemon) initCgroupsPath(path string) error {
// for the period and runtime as this limits what the children can be set to.
daemon.initCgroupsPath(filepath.Dir(path))
_, root, err := cgroups.FindCgroupMountpointAndRoot("cpu")
mnt, root, err := cgroups.FindCgroupMountpointAndRoot("cpu")
if err != nil {
return err
}
// When docker is run inside docker, the root is based of the host cgroup.
// Should this be handled in runc/libcontainer/cgroups ?
if strings.HasPrefix(root, "/docker/") {
root = "/"
}
path = filepath.Join(root, path)
path = filepath.Join(mnt, root, path)
sysinfo := sysinfo.New(true)
if err := maybeCreateCPURealTimeFile(sysinfo.CPURealtimePeriod, daemon.configStore.CPURealtimePeriod, "cpu.rt_period_us", path); err != nil {
return err