prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reenable netlink cpu tracking

Browse Source
This commit is contained in:
Katie Knister 2015-04-14 14:03:54 -07:00
parent 9724c705a7
commit 00ce5ca367
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
manager/manager.go
View File

@ -175,25 +175,23 @@ type manager struct {
// Start the container manager. // Start the container manager.
func (self *manager) Start() error { func (self *manager) Start() error {
// TODO(rjnagal): Skip creating cpu load reader while we improve resource usage and accuracy.
if false { // Create cpu load reader.
// Create cpu load reader. cpuLoadReader, err := cpuload.New()
cpuLoadReader, err := cpuload.New() if err != nil {
// TODO(rjnagal): Promote to warning once we support cpu load inside namespaces.
glog.Infof("Could not initialize cpu load reader: %s", err)
} else {
err = cpuLoadReader.Start()
if err != nil { if err != nil {
// TODO(rjnagal): Promote to warning once we support cpu load inside namespaces. glog.Warning("Could not start cpu load stat collector: %s", err)
glog.Infof("Could not initialize cpu load reader: %s", err)
} else { } else {
err = cpuLoadReader.Start() self.loadReader = cpuLoadReader
if err != nil {
glog.Warning("Could not start cpu load stat collector: %s", err)
} else {
self.loadReader = cpuLoadReader
}
} }
} }
// Watch for OOMs. // Watch for OOMs.
err := self.watchForNewOoms() err = self.watchForNewOoms()
if err != nil { if err != nil {
glog.Errorf("Failed to start OOM watcher, will not get OOM events: %v", err) glog.Errorf("Failed to start OOM watcher, will not get OOM events: %v", err)
} }