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

only fail fs stat gather if metadata device not found

Browse Source
This commit is contained in:
Seth Jennings 2016-06-21 14:50:04 -05:00
parent f3bca888f8
commit eafff745a5
1 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
container/docker/factory.go
View File

@ -22,6 +22,7 @@ import (
"strings" "strings"
"sync" "sync"
dockertypes "github.com/docker/engine-api/types"
"github.com/google/cadvisor/container" "github.com/google/cadvisor/container"
"github.com/google/cadvisor/container/libcontainer" "github.com/google/cadvisor/container/libcontainer"
"github.com/google/cadvisor/devicemapper" "github.com/google/cadvisor/devicemapper"
@ -171,6 +172,31 @@ var (
version_re = regexp.MustCompile(version_regexp_string) 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! // Register root container before running this function!
func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, ignoreMetrics container.MetricSet) error { func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, ignoreMetrics container.MetricSet) error {
client, err := Client() 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) return fmt.Errorf("failed to get cgroup subsystems: %v", err)
} }
var ( var thinPoolWatcher *devicemapper.ThinPoolWatcher
dockerStorageDriver = storageDriver(dockerInfo.Driver) if storageDriver(dockerInfo.Driver) == devicemapperStorageDriver {
thinPoolWatcher *devicemapper.ThinPoolWatcher = nil thinPoolWatcher, err = startThinPoolWatcher(dockerInfo)
) if err != nil {
glog.Errorf("devicemapper filesystem stats will not be reported: %v", err)
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)
} }
} }