Skip to content

Commit b5b6989

Browse files
committed
Fix runc pause and runc update
Fixes: #1034 Fixes: #1031 Signed-off-by: Qiang Huang <[email protected]>
1 parent da7bac1 commit b5b6989

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

libcontainer/cgroups/fs/apply_raw.go

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -196,17 +196,8 @@ func (m *Manager) Set(container *configs.Config) error {
196196
return nil
197197
}
198198
for _, sys := range subsystems {
199-
// Generate fake cgroup data.
200-
d, err := getCgroupData(container.Cgroups, -1)
201-
if err != nil {
202-
return err
203-
}
204-
// Get the path, but don't error out if the cgroup wasn't found.
205-
path, err := d.path(sys.Name())
206-
if err != nil && !cgroups.IsNotFound(err) {
207-
return err
208-
}
209-
199+
paths := m.GetPaths()
200+
path := paths[sys.Name()]
210201
if err := sys.Set(path, container.Cgroups); err != nil {
211202
return err
212203
}
@@ -223,14 +214,8 @@ func (m *Manager) Set(container *configs.Config) error {
223214
// Freeze toggles the container's freezer cgroup depending on the state
224215
// provided
225216
func (m *Manager) Freeze(state configs.FreezerState) error {
226-
d, err := getCgroupData(m.Cgroups, 0)
227-
if err != nil {
228-
return err
229-
}
230-
dir, err := d.path("freezer")
231-
if err != nil {
232-
return err
233-
}
217+
paths := m.GetPaths()
218+
dir := paths["freezer"]
234219
prevState := m.Cgroups.Resources.Freezer
235220
m.Cgroups.Resources.Freezer = state
236221
freezer, err := subsystems.Get("freezer")

0 commit comments

Comments
 (0)