Skip to content

Commit

Permalink
Merge pull request #3804 from jiusanzhou/bugfix/skip-update-while-fro…
Browse files Browse the repository at this point in the history
…zen-faield

libct/cg/sd/v1: do not update non-frozen cgroup after frozen failed.
  • Loading branch information
AkihiroSuda authored Jun 27, 2023
2 parents 1bc2999 + 62963fe commit 92c71e7
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions libcontainer/cgroups/systemd/v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,15 @@ func (m *LegacyManager) Set(r *configs.Resources) error {
if err := m.doFreeze(configs.Frozen); err != nil {
// If freezer cgroup isn't supported, we just warn about it.
logrus.Infof("freeze container before SetUnitProperties failed: %v", err)
// skip update the cgroup while frozen failed. #3803
if !errors.Is(err, errSubsystemDoesNotExist) {
if needsThaw {
if thawErr := m.doFreeze(configs.Thawed); thawErr != nil {
logrus.Infof("thaw container after doFreeze failed: %v", thawErr)
}
}
return err
}
}
}
setErr := setUnitProperties(m.dbus, unitName, properties...)
Expand Down

0 comments on commit 92c71e7

Please sign in to comment.