From b5b6989e9a14a7fd3afbe82bece34df5303c2d0d Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Mon, 12 Sep 2016 16:02:56 +0800 Subject: [PATCH] Fix runc pause and runc update Fixes: #1034 Fixes: #1031 Signed-off-by: Qiang Huang --- libcontainer/cgroups/fs/apply_raw.go | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/libcontainer/cgroups/fs/apply_raw.go b/libcontainer/cgroups/fs/apply_raw.go index ee27ed6d..b32f5068 100644 --- a/libcontainer/cgroups/fs/apply_raw.go +++ b/libcontainer/cgroups/fs/apply_raw.go @@ -196,17 +196,8 @@ func (m *Manager) Set(container *configs.Config) error { return nil } for _, sys := range subsystems { - // Generate fake cgroup data. - d, err := getCgroupData(container.Cgroups, -1) - if err != nil { - return err - } - // Get the path, but don't error out if the cgroup wasn't found. - path, err := d.path(sys.Name()) - if err != nil && !cgroups.IsNotFound(err) { - return err - } - + paths := m.GetPaths() + path := paths[sys.Name()] if err := sys.Set(path, container.Cgroups); err != nil { return err } @@ -223,14 +214,8 @@ func (m *Manager) Set(container *configs.Config) error { // Freeze toggles the container's freezer cgroup depending on the state // provided func (m *Manager) Freeze(state configs.FreezerState) error { - d, err := getCgroupData(m.Cgroups, 0) - if err != nil { - return err - } - dir, err := d.path("freezer") - if err != nil { - return err - } + paths := m.GetPaths() + dir := paths["freezer"] prevState := m.Cgroups.Resources.Freezer m.Cgroups.Resources.Freezer = state freezer, err := subsystems.Get("freezer")