From d78e6053bb6d169a13b6a98b79e623a85d44c849 Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Thu, 23 Jun 2016 21:01:52 -0400 Subject: [PATCH] bump(google/cadvisor): v0.23.6 Fix a bug where cadvisor couldn't gather container filesystem stats on RHEL 7.2 devicemapper. --- Godeps/Godeps.json | 160 +++++++++--------- .../devicemapper/thin_pool_watcher.go | 14 +- 2 files changed, 87 insertions(+), 87 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 87223706f43..2ac71a977df 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -927,203 +927,203 @@ }, { "ImportPath": "github.com/google/cadvisor/api", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/cache/memory", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/collector", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/container", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/container/common", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/container/docker", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/container/libcontainer", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/container/raw", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/container/rkt", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/container/systemd", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/devicemapper", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/events", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/fs", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/healthz", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/http", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/http/mux", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/info/v1", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/info/v1/test", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/info/v2", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/machine", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/manager", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/manager/watcher", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/manager/watcher/raw", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/manager/watcher/rkt", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/metrics", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/pages", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/pages/static", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/storage", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/summary", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/utils", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/utils/cloudinfo", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/utils/cpuload", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/utils/docker", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/utils/oomparser", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/utils/sysfs", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/utils/sysinfo", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/utils/tail", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/validate", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/cadvisor/version", - "Comment": "v0.23.5", - "Rev": "3ecedda96383d3342a5c8e5b8f39c7c9db65982f" + "Comment": "v0.23.6", + "Rev": "4dbefc9b671b81257973a33211fb12370c1a526e" }, { "ImportPath": "github.com/google/gofuzz", diff --git a/vendor/github.com/google/cadvisor/devicemapper/thin_pool_watcher.go b/vendor/github.com/google/cadvisor/devicemapper/thin_pool_watcher.go index 4062f1fed25..bf2300a33bd 100644 --- a/vendor/github.com/google/cadvisor/devicemapper/thin_pool_watcher.go +++ b/vendor/github.com/google/cadvisor/devicemapper/thin_pool_watcher.go @@ -150,8 +150,8 @@ func (w *ThinPoolWatcher) Refresh() error { } const ( - thinPoolDmsetupStatusTokens = 11 thinPoolDmsetupStatusHeldMetadataRoot = 6 + thinPoolDmsetupStatusMinFields = thinPoolDmsetupStatusHeldMetadataRoot + 1 ) // checkReservation checks to see whether the thin device is currently holding @@ -163,14 +163,14 @@ func (w *ThinPoolWatcher) checkReservation(poolName string) (bool, error) { return false, err } - tokens := strings.Split(string(output), " ") - // Split returns the input as the last item in the result, adjust the - // number of tokens by one - if len(tokens) != thinPoolDmsetupStatusTokens+1 { - return false, fmt.Errorf("unexpected output of dmsetup status command; expected 11 fields, got %v; output: %v", len(tokens), string(output)) + // we care about the field at fields[thinPoolDmsetupStatusHeldMetadataRoot], + // so make sure we get enough fields + fields := strings.Fields(string(output)) + if len(fields) < thinPoolDmsetupStatusMinFields { + return false, fmt.Errorf("unexpected output of dmsetup status command; expected at least %d fields, got %v; output: %v", thinPoolDmsetupStatusMinFields, len(fields), string(output)) } - heldMetadataRoot := tokens[thinPoolDmsetupStatusHeldMetadataRoot] + heldMetadataRoot := fields[thinPoolDmsetupStatusHeldMetadataRoot] currentlyReserved := heldMetadataRoot != "-" return currentlyReserved, nil }