From 98651fca01a8b694f449cb4f8eb3aba20b872683 Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Wed, 22 Jun 2016 17:04:54 -0400 Subject: [PATCH] bump(google/cadvisor): v0.23.5 Fix an issue where cadvisor was unable to report container filesystem stats for LVM-based devicemapper thin pools. Fix an issue where cadvisor would not report any stats for a container if it failed to get the filesystem stats when Docker's storage driver is devicemapper. --- Godeps/Godeps.json | 160 +++++++++--------- .../cadvisor/container/docker/factory.go | 65 ++++--- .../google/cadvisor/utils/docker/docker.go | 16 +- 3 files changed, 125 insertions(+), 116 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 60ec7a96c5..d64736db67 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -927,203 +927,203 @@ }, { "ImportPath": "github.com/google/cadvisor/api", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/cache/memory", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/collector", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/container", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/container/common", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/container/docker", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/container/libcontainer", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/container/raw", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/container/rkt", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/container/systemd", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/devicemapper", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/events", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/fs", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/healthz", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/http", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/http/mux", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/info/v1", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/info/v1/test", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/info/v2", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/machine", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/manager", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/manager/watcher", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/manager/watcher/raw", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/manager/watcher/rkt", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/metrics", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/pages", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/pages/static", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/storage", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/summary", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/utils", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/utils/cloudinfo", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/utils/cpuload", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/utils/docker", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/utils/oomparser", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/utils/sysfs", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/utils/sysinfo", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/utils/tail", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/validate", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/cadvisor/version", - "Comment": "v0.23.4", - "Rev": "7d22cf63253c17bad8ab64b8eef679718d00342e" + "Comment": "v0.23.5", + "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" }, { "ImportPath": "github.com/google/gofuzz", diff --git a/vendor/github.com/google/cadvisor/container/docker/factory.go b/vendor/github.com/google/cadvisor/container/docker/factory.go index 6edfcd935d..68d5046816 100644 --- a/vendor/github.com/google/cadvisor/container/docker/factory.go +++ b/vendor/github.com/google/cadvisor/container/docker/factory.go @@ -22,6 +22,7 @@ import ( "strings" "sync" + dockertypes "github.com/docker/engine-api/types" "github.com/google/cadvisor/container" "github.com/google/cadvisor/container/libcontainer" "github.com/google/cadvisor/devicemapper" @@ -171,6 +172,31 @@ var ( version_re = regexp.MustCompile(version_regexp_string) ) +func startThinPoolWatcher(dockerInfo *dockertypes.Info) (*devicemapper.ThinPoolWatcher, error) { + _, err := devicemapper.ThinLsBinaryPresent() + if err != nil { + return nil, err + } + + dockerThinPoolName, err := dockerutil.DockerThinPoolName(*dockerInfo) + if err != nil { + return nil, err + } + + dockerMetadataDevice, err := dockerutil.DockerMetadataDevice(*dockerInfo) + if err != nil { + return nil, err + } + + thinPoolWatcher, err := devicemapper.NewThinPoolWatcher(dockerThinPoolName, dockerMetadataDevice) + if err != nil { + return nil, err + } + + go thinPoolWatcher.Start() + return thinPoolWatcher, nil +} + // Register root container before running this function! func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, ignoreMetrics container.MetricSet) error { client, err := Client() @@ -191,40 +217,11 @@ func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, ignoreMetrics c return fmt.Errorf("failed to get cgroup subsystems: %v", err) } - var ( - dockerStorageDriver = storageDriver(dockerInfo.Driver) - thinPoolWatcher *devicemapper.ThinPoolWatcher = nil - ) - - if dockerStorageDriver == devicemapperStorageDriver { - _, err := devicemapper.ThinLsBinaryPresent() - if err == nil { - // If the storage driver is devicemapper, create and start a - // ThinPoolWatcher to monitor the size of container CoW layers - // with thin_ls. - dockerThinPoolName, err := dockerutil.DockerThinPoolName(*dockerInfo) - if err != nil { - return fmt.Errorf("couldn't find device mapper thin pool name: %v", err) - } - - dockerMetadataDevice, err := dockerutil.DockerMetadataDevice(*dockerInfo) - if err != nil { - return fmt.Errorf("couldn't determine devicemapper metadata device: %v", err) - } - - thinPoolWatcher, err = devicemapper.NewThinPoolWatcher(dockerThinPoolName, dockerMetadataDevice) - if err != nil { - return fmt.Errorf("couldn't create thin pool watcher: %v", err) - } - - go thinPoolWatcher.Start() - } else { - msg := []string{ - "Couldn't locate thin_ls binary; not starting thin pool watcher.", - "Containers backed by thin pools will not show accurate usage.", - "err: %v", - } - glog.Errorf(strings.Join(msg, " "), err) + var thinPoolWatcher *devicemapper.ThinPoolWatcher + if storageDriver(dockerInfo.Driver) == devicemapperStorageDriver { + thinPoolWatcher, err = startThinPoolWatcher(dockerInfo) + if err != nil { + glog.Errorf("devicemapper filesystem stats will not be reported: %v", err) } } diff --git a/vendor/github.com/google/cadvisor/utils/docker/docker.go b/vendor/github.com/google/cadvisor/utils/docker/docker.go index 568bd12178..3ae627977b 100644 --- a/vendor/github.com/google/cadvisor/utils/docker/docker.go +++ b/vendor/github.com/google/cadvisor/utils/docker/docker.go @@ -16,6 +16,7 @@ package docker import ( "fmt" + "os" "strings" dockertypes "github.com/docker/engine-api/types" @@ -50,8 +51,19 @@ func DockerThinPoolName(info dockertypes.Info) (string, error) { func DockerMetadataDevice(info dockertypes.Info) (string, error) { metadataDevice := DriverStatusValue(info.DriverStatus, DriverStatusMetadataFile) - if len(metadataDevice) == 0 { - return "", fmt.Errorf("Could not get the devicemapper metadata device") + if len(metadataDevice) != 0 { + return metadataDevice, nil + } + + poolName, err := DockerThinPoolName(info) + if err != nil { + return "", err + } + + metadataDevice = fmt.Sprintf("/dev/mapper/%s_tmeta", poolName) + + if _, err := os.Stat(metadataDevice); err != nil { + return "", err } return metadataDevice, nil