Update cadvisor deps to v0.19.3.2

Signed-off-by: Vishnu kannan <vishnuk@google.com>
This commit is contained in:
Vishnu kannan 2015-12-04 11:40:41 -08:00
parent 9e896e3416
commit 215d0810a2
7 changed files with 51 additions and 37 deletions

72
Godeps/Godeps.json generated
View File

@ -434,93 +434,93 @@
}, },
{ {
"ImportPath": "github.com/google/cadvisor/api", "ImportPath": "github.com/google/cadvisor/api",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/cache/memory", "ImportPath": "github.com/google/cadvisor/cache/memory",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/collector", "ImportPath": "github.com/google/cadvisor/collector",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/container", "ImportPath": "github.com/google/cadvisor/container",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/events", "ImportPath": "github.com/google/cadvisor/events",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/fs", "ImportPath": "github.com/google/cadvisor/fs",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/healthz", "ImportPath": "github.com/google/cadvisor/healthz",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/http", "ImportPath": "github.com/google/cadvisor/http",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v1", "ImportPath": "github.com/google/cadvisor/info/v1",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/info/v2", "ImportPath": "github.com/google/cadvisor/info/v2",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/manager", "ImportPath": "github.com/google/cadvisor/manager",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/metrics", "ImportPath": "github.com/google/cadvisor/metrics",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/pages", "ImportPath": "github.com/google/cadvisor/pages",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/storage", "ImportPath": "github.com/google/cadvisor/storage",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/summary", "ImportPath": "github.com/google/cadvisor/summary",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/utils", "ImportPath": "github.com/google/cadvisor/utils",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/validate", "ImportPath": "github.com/google/cadvisor/validate",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/cadvisor/version", "ImportPath": "github.com/google/cadvisor/version",
"Comment": "v0.19.3-3-g3bfcb1e", "Comment": "v0.19.3.2",
"Rev": "3bfcb1e7cfc7de5fe42bba028aaacf2512100cb9" "Rev": "a8085bf9276c22f16dbcd7aa56f0d4d0626a0b2e"
}, },
{ {
"ImportPath": "github.com/google/gofuzz", "ImportPath": "github.com/google/gofuzz",

View File

@ -78,4 +78,7 @@ type ContainerHandler interface {
// Returns whether the container still exists. // Returns whether the container still exists.
Exists() bool Exists() bool
// Cleanup frees up any resources being held like fds or go routines, etc.
Cleanup()
} }

View File

@ -156,6 +156,10 @@ func newDockerContainerHandler(
return handler, nil return handler, nil
} }
func (self *dockerContainerHandler) Cleanup() {
self.fsHandler.stop()
}
func (self *dockerContainerHandler) ContainerReference() (info.ContainerReference, error) { func (self *dockerContainerHandler) ContainerReference() (info.ContainerReference, error) {
return info.ContainerReference{ return info.ContainerReference{
Name: self.name, Name: self.name,

View File

@ -50,6 +50,8 @@ func (self *MockContainerHandler) ContainerReference() (info.ContainerReference,
return args.Get(0).(info.ContainerReference), args.Error(1) return args.Get(0).(info.ContainerReference), args.Error(1)
} }
func (self *MockContainerHandler) Cleanup() {}
func (self *MockContainerHandler) GetSpec() (info.ContainerSpec, error) { func (self *MockContainerHandler) GetSpec() (info.ContainerSpec, error) {
args := self.Called() args := self.Called()
return args.Get(0).(info.ContainerSpec), args.Error(1) return args.Get(0).(info.ContainerSpec), args.Error(1)

View File

@ -165,6 +165,9 @@ func (self *rawContainerHandler) GetRootNetworkDevices() ([]info.NetInfo, error)
return nd, nil return nd, nil
} }
// Nothing to clean up.
func (self *rawContainerHandler) Cleanup() {}
func (self *rawContainerHandler) GetSpec() (info.ContainerSpec, error) { func (self *rawContainerHandler) GetSpec() (info.ContainerSpec, error) {
var spec info.ContainerSpec var spec info.ContainerSpec

View File

@ -370,6 +370,8 @@ func (c *containerData) housekeeping() {
for { for {
select { select {
case <-c.stop: case <-c.stop:
// Cleanup container resources before stopping housekeeping.
c.handler.Cleanup()
// Stop housekeeping when signaled. // Stop housekeeping when signaled.
return return
default: default:

View File

@ -1 +1 @@
0.19.3.1 0.19.3.2