Merge pull request #312 from bwester/cgroups

Use "cgroup.procs" for cgroup membership
square · Oct 29, 2015 · cba7473 · cba7473
2 parents 8055684 + e6c2a30
commit cba7473
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bin/p2-exec/main.go b/bin/p2-exec/main.go
@@ -190,7 +190,7 @@ func cgEnter(platconf, launchableName, cgroupName string) error {
 	} else if err != nil {
 		return util.Errorf("Could not set cgroup parameters: %s", err)
 	}
-	return cg.AddPID(cgConfig.Name, os.Getpid())
+	return cg.AddPID(cgConfig.Name, 0)
 }
 
 // generalized code to remove rlimits on both darwin and linux

diff --git a/pkg/cgroups/cgroups.go b/pkg/cgroups/cgroups.go
@@ -173,11 +173,11 @@ func (subsys Subsystems) Write(config Config) error {
 }
 
 func (subsys Subsystems) AddPID(name string, pid int) error {
-	err := appendIntToFile(filepath.Join(subsys.Memory, name, "tasks"), pid)
+	err := appendIntToFile(filepath.Join(subsys.Memory, name, "cgroup.procs"), pid)
 	if err != nil {
 		return err
 	}
-	return appendIntToFile(filepath.Join(subsys.CPU, name, "tasks"), pid)
+	return appendIntToFile(filepath.Join(subsys.CPU, name, "cgroup.procs"), pid)
 }
 
 func appendIntToFile(filename string, data int) error {