cgroups: replace SetPaths on LoadCgroupManager

Signed-off-by: Andrey Vagin <avagin@openvz.org>

cgroups/cgroups.go

@@ -16,7 +16,6 @@ type Manager interface {
 
 	RemovePaths() error
 	GetPaths() map[string]string
-	SetPaths(map[string]string)
 }
 
 type FreezerState string

cgroups/fs/apply_raw.go

@@ -26,7 +26,7 @@ var (
 
 type Manager struct {
 	Cgroups *cgroups.Cgroup
-	paths   map[string]string
+	Paths   map[string]string
 }
 
 // The absolute path to the root of the cgroup hierarchies.
@@ -94,21 +94,17 @@ func (m *Manager) Apply(pid int) error {
 		}
 		paths[name] = p
 	}
-	m.paths = paths
+	m.Paths = paths
 
 	return nil
 }
 
 func (m *Manager) RemovePaths() error {
-	return cgroups.RemovePaths(m.paths)
+	return cgroups.RemovePaths(m.Paths)
 }
 
 func (m *Manager) GetPaths() map[string]string {
-	return m.paths
+	return m.Paths
-}
-
-func (m *Manager) SetPaths(paths map[string]string) {
-	m.paths = paths
 }
 
 // Symmetrical public function to update device based cgroups.  Also available
@@ -126,7 +122,7 @@ func ApplyDevices(c *cgroups.Cgroup, pid int) error {
 
 func (m *Manager) GetStats() (*cgroups.Stats, error) {
 	stats := cgroups.NewStats()
-	for name, path := range m.paths {
+	for name, path := range m.Paths {
 		sys, ok := subsystems[name]
 		if !ok {
 			continue

cgroups/manager/manager.go

@@ -17,3 +17,17 @@ func NewCgroupManager(cgroups *cgroups.Cgroup) cgroups.Manager {
 		Cgroups: cgroups,
 	}
 }
+
+func LoadCgroupManager(cgroups *cgroups.Cgroup, paths map[string]string) cgroups.Manager {
+	if systemd.UseSystemd() {
+		return &systemd.Manager{
+			Cgroups: cgroups,
+			Paths:   paths,
+		}
+	}
+
+	return &fs.Manager{
+		Cgroups: cgroups,
+		Paths:   paths,
+	}
+}

cgroups/systemd/apply_nosystemd.go

@@ -10,6 +10,7 @@ import (
 
 type Manager struct {
 	Cgroups *cgroups.Cgroup
+	Paths   map[string]string
 }
 
 func UseSystemd() bool {
@@ -32,9 +33,6 @@ func (m *Manager) GetPaths() map[string]string {
 	return nil
 }
 
-func (m *Manager) SetPaths(paths map[string]string) {
-}
-
 func (m *Manager) GetStats() (*cgroups.Stats, error) {
 	return nil, fmt.Errorf("Systemd not supported")
 }

cgroups/systemd/apply_systemd.go

@@ -21,7 +21,7 @@ import (
 
 type Manager struct {
 	Cgroups *cgroups.Cgroup
-	paths   map[string]string
+	Paths   map[string]string
 }
 
 type subsystem interface {
@@ -168,21 +168,17 @@ func (m *Manager) Apply(pid int) error {
 		paths[sysname] = subsystemPath
 	}
 
-	m.paths = paths
+	m.Paths = paths
 
 	return nil
 }
 
 func (m *Manager) RemovePaths() error {
-	return cgroups.RemovePaths(m.paths)
+	return cgroups.RemovePaths(m.Paths)
 }
 
 func (m *Manager) GetPaths() map[string]string {
-	return m.paths
+	return m.Paths
-}
-
-func (m *Manager) SetPaths(paths map[string]string) {
-	m.paths = paths
 }
 
 func writeFile(dir, file, data string) error {

linux_container_test.go

@@ -34,9 +34,6 @@ func (m *mockCgroupManager) GetPaths() map[string]string {
 	return nil
 }
 
-func (m *mockCgroupManager) SetPaths(map[string]string) {
-}
-
 func (m *mockCgroupManager) Freeze(state cgroups.FreezerState) error {
 	return nil
 }

linux_factory.go

@@ -117,8 +117,7 @@ func (l *linuxFactory) Load(id string) (Container, error) {
 		return nil, err
 	}
 
-	cgroupManager := cgroups.NewCgroupManager(config.Cgroups)
+	cgroupManager := cgroups.LoadCgroupManager(config.Cgroups, state.CgroupPaths)
-	cgroupManager.SetPaths(state.CgroupPaths)
 	glog.Infof("using %s as cgroup manager", cgroupManager)
 	return &linuxContainer{
 		id:            id,