libct/isPaused: don't use GetPaths from v2 code

Using GetPaths from cgroupv2 unified hierarchy code is deprecated
and this function will (hopefully) be removed.

Use GetUnifiedPath() for v2 case.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2020-03-31 18:24:44 -07:00
parent 9ec5b03e5a
commit 8d7977ee6e
1 changed files with 17 additions and 8 deletions

View File

@ -1822,14 +1822,23 @@ func (c *linuxContainer) runType() Status {
} }
func (c *linuxContainer) isPaused() (bool, error) { func (c *linuxContainer) isPaused() (bool, error) {
fcg := c.cgroupManager.GetPaths()["freezer"] var fcg, filename, pausedState string
if fcg == "" {
// A container doesn't have a freezer cgroup if !cgroups.IsCgroup2UnifiedMode() {
return false, nil fcg = c.cgroupManager.GetPaths()["freezer"]
} if fcg == "" {
pausedState := "FROZEN" // A container doesn't have a freezer cgroup
filename := "freezer.state" return false, nil
if cgroups.IsCgroup2UnifiedMode() { }
filename = "freezer.state"
pausedState = "FROZEN"
} else {
var err error
fcg, err = c.cgroupManager.GetUnifiedPath()
if err != nil {
// should not happen
return false, err
}
filename = "cgroup.freeze" filename = "cgroup.freeze"
pausedState = "1" pausedState = "1"
} }