Skip to content

K
k3s
Unverified Commit bcfdb398 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #60867 from Random-Liu/update-cadvisor

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update cadvisor to v0.29.1 Update cadvisor to v0.29.1 to include a bug fix for containerd integration. https://github.com/google/cadvisor/pull/1894 **Release note**: ```release-note none ```
parents 9501c525 36015903
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 89 deletions
Godeps/Godeps.json
View file @ bcfdb398
...@@ -1475,218 +1475,218 @@ ...@@ -1475,218 +1475,218 @@
}, },
{ {
"ImportPath": "github.com/google/cadvisor/accelerators", "ImportPath": "github.com/google/cadvisor/accelerators",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/api", "ImportPath": "github.com/google/cadvisor/api",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/cache/memory", "ImportPath": "github.com/google/cadvisor/cache/memory",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/client/v2", "ImportPath": "github.com/google/cadvisor/client/v2",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/collector", "ImportPath": "github.com/google/cadvisor/collector",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container", "ImportPath": "github.com/google/cadvisor/container",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/common", "ImportPath": "github.com/google/cadvisor/container/common",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/containerd", "ImportPath": "github.com/google/cadvisor/container/containerd",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/crio", "ImportPath": "github.com/google/cadvisor/container/crio",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/docker", "ImportPath": "github.com/google/cadvisor/container/docker",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/libcontainer", "ImportPath": "github.com/google/cadvisor/container/libcontainer",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/raw", "ImportPath": "github.com/google/cadvisor/container/raw",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/rkt", "ImportPath": "github.com/google/cadvisor/container/rkt",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container/systemd", "ImportPath": "github.com/google/cadvisor/container/systemd",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/devicemapper", "ImportPath": "github.com/google/cadvisor/devicemapper",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/events", "ImportPath": "github.com/google/cadvisor/events",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/fs", "ImportPath": "github.com/google/cadvisor/fs",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/healthz", "ImportPath": "github.com/google/cadvisor/healthz",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http", "ImportPath": "github.com/google/cadvisor/http",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http/mux", "ImportPath": "github.com/google/cadvisor/http/mux",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v1", "ImportPath": "github.com/google/cadvisor/info/v1",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v2", "ImportPath": "github.com/google/cadvisor/info/v2",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/machine", "ImportPath": "github.com/google/cadvisor/machine",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager", "ImportPath": "github.com/google/cadvisor/manager",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher", "ImportPath": "github.com/google/cadvisor/manager/watcher",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher/raw", "ImportPath": "github.com/google/cadvisor/manager/watcher/raw",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager/watcher/rkt", "ImportPath": "github.com/google/cadvisor/manager/watcher/rkt",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/metrics", "ImportPath": "github.com/google/cadvisor/metrics",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages", "ImportPath": "github.com/google/cadvisor/pages",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages/static", "ImportPath": "github.com/google/cadvisor/pages/static",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/storage", "ImportPath": "github.com/google/cadvisor/storage",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/summary", "ImportPath": "github.com/google/cadvisor/summary",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils", "ImportPath": "github.com/google/cadvisor/utils",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cloudinfo", "ImportPath": "github.com/google/cadvisor/utils/cloudinfo",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cpuload", "ImportPath": "github.com/google/cadvisor/utils/cpuload",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink", "ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/docker", "ImportPath": "github.com/google/cadvisor/utils/docker",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/oomparser", "ImportPath": "github.com/google/cadvisor/utils/oomparser",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/sysfs", "ImportPath": "github.com/google/cadvisor/utils/sysfs",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils/sysinfo", "ImportPath": "github.com/google/cadvisor/utils/sysinfo",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/validate", "ImportPath": "github.com/google/cadvisor/validate",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/version", "ImportPath": "github.com/google/cadvisor/version",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/zfs", "ImportPath": "github.com/google/cadvisor/zfs",
"Comment": "v0.29.0", "Comment": "v0.29.1",
"Rev": "aaaa65dba02880718d0237cd4e80ab8eb278bb19" "Rev": "2e02d28350c5fbbad9cfb7e5a1733468b75ab3f9"
}, },
{ {
"ImportPath": "github.com/google/certificate-transparency/go", "ImportPath": "github.com/google/certificate-transparency/go",
......
vendor/github.com/google/cadvisor/container/containerd/handler.go
View file @ bcfdb398
...@@ -22,6 +22,7 @@ import ( ...@@ -22,6 +22,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/containerd/containerd/errdefs"
"github.com/opencontainers/runc/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups"
cgroupfs "github.com/opencontainers/runc/libcontainer/cgroups/fs" cgroupfs "github.com/opencontainers/runc/libcontainer/cgroups/fs"
libcontainerconfigs "github.com/opencontainers/runc/libcontainer/configs" libcontainerconfigs "github.com/opencontainers/runc/libcontainer/configs"
...@@ -103,10 +104,28 @@ func newContainerdContainerHandler( ...@@ -103,10 +104,28 @@ func newContainerdContainerHandler(
return nil, err return nil, err
} }
taskPid, err := client.TaskPid(ctx, id) // Cgroup is created during task creation. When cadvisor sees the cgroup,
if err != nil { // task may not be fully created yet. Use a retry+backoff to tolerant the
return nil, err // race condition.
// TODO(random-liu): Use cri-containerd client to talk with cri-containerd
// instead. cri-containerd has some internal synchronization to make sure
// `ContainerStatus` only returns result after `StartContainer` finishes.
var taskPid uint32
backoff := 100 * time.Millisecond
retry := 5
for {
taskPid, err = client.TaskPid(ctx, id)
if err == nil {
break
}
retry--
if !errdefs.IsNotFound(err) || retry == 0 {
return nil, err
}
time.Sleep(backoff)
backoff *= 2
} }
rootfs := "/" rootfs := "/"
if !inHostNamespace { if !inHostNamespace {
rootfs = "/rootfs" rootfs = "/rootfs"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment