Thanks to visit codestin.com
Credit goes to github.com

Skip to content

oci_linux: fix working set calculation #4068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Aug 17, 2020
Merged

oci_linux: fix working set calculation #4068

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eddf148
oci_linux: fix working set calculation
kolyshkin Aug 11, 2020
dca8285
oci_linux: fix working set calculation for cgroupv2
kolyshkin Aug 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions internal/oci/oci_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"bufio"
"fmt"
"os"
"path/filepath"
"strconv"
"strings"
"syscall"
Expand Down Expand Up @@ -88,13 +89,13 @@ func (r *runtimeOCI) containerStats(ctr *Container, cgroup string) (*ContainerSt
stats.NetInput, stats.NetOutput = getContainerNetIO(netNsPath)
}

totalInactiveFile, err := getTotalInactiveFile()
totalInactiveFile, err := getTotalInactiveFile(cgroupPath)
if err != nil { // nolint: gocritic
logrus.Warnf("error in memory working set stats retrieval: %v", err)
} else if stats.MemUsage > totalInactiveFile {
stats.WorkingSetBytes = stats.MemUsage - totalInactiveFile
} else {
logrus.Debugf(
logrus.Warnf(
"unable to account working set stats: total_inactive_file (%d) > memory usage (%d)",
totalInactiveFile, stats.MemUsage,
)
Expand Down Expand Up @@ -153,39 +154,39 @@ func metricsToCtrStats(c *Container, m *cgroups.Metrics) *ContainerStats {
}
}

// getTotalInactiveFile returns the value if `total_inactive_file` as integer
// from `/sys/fs/cgroup/memory/memory.stat`. It returns an error if the file is
// not parsable.
func getTotalInactiveFile() (uint64, error) {
// TODO: no cgroupv2 support right now
// getTotalInactiveFile returns the value if inactive_file as integer
// from cgroup's memory.stat. Returns an error if the file does not exists,
// not parsable, or the value is not found.
func getTotalInactiveFile(path string) (uint64, error) {
var filename, varPrefix string
if node.CgroupIsV2() {
return 0, nil
filename = filepath.Join("/sys/fs/cgroup", path, "memory.stat")
varPrefix = "inactive_file "
} else {
filename = filepath.Join("/sys/fs/cgroup/memory", path, "memory.stat")
varPrefix = "total_inactive_file "
}

const memoryStat = "/sys/fs/cgroup/memory/memory.stat"
const totalInactiveFilePrefix = "total_inactive_file "
f, err := os.Open(memoryStat)
f, err := os.Open(filename)
if err != nil {
return 0, err
}
defer f.Close()

scanner := bufio.NewScanner(f)
for scanner.Scan() {
if strings.Contains(scanner.Text(), totalInactiveFilePrefix) {
if strings.HasPrefix(scanner.Text(), varPrefix) {
val, err := strconv.Atoi(
strings.TrimPrefix(scanner.Text(), totalInactiveFilePrefix),
strings.TrimPrefix(scanner.Text(), varPrefix),
)
if err != nil {
return 0, errors.Wrap(err, "unable to parse total inactive file value")
}
return uint64(val), nil
}
}

if err := scanner.Err(); err != nil {
return 0, err
}

return 0, errors.Errorf("%q not found in %v", totalInactiveFilePrefix, memoryStat)
return 0, errors.Errorf("%q not found in %v", varPrefix, filename)
}