Commit 9607748

committed

UPSTREAM: google/cadvisor: <drop>: Hack around cgroup load

Running containerized on RHEL7 exposes a cAdvisor bug google/cadvisor#1461 where the cgroup path given by docker (cpuacct,cpu) is used in preference to the cgroup path mounted in with -v /sys:/sys. This commit skips all cgroup paths that have a comma until we have a real fix in libcontainer and cadvisor.

1 parent d804d1f commit 9607748Copy full SHA for 9607748

2 files changed

+20

-2

lines changed

vendor
- github.com/opencontainers/runc/libcontainer/cgroups
  - utils.go
- k8s.io/kubernetes/test/e2e/framework
  - kubelet_stats.go

2 files changed

+20

-2

lines changed

`‎vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go`

+18

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎vendor/k8s.io/kubernetes/test/e2e/framework/kubelet_stats.go`

+2-2

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)