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

Merge pull request #996 from jonboulle/master

Browse Source 
Fix case statements dealing with storageDriver
This commit is contained in:
Jimmi Dyson 2015-12-03 09:28:08 +00:00
commit f743aab0e6
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
container/docker/handler.go
View File

@ -234,11 +234,11 @@ func (self *dockerContainerHandler) GetSpec() (info.ContainerSpec, error) {
spec := libcontainerConfigToContainerSpec(libcontainerConfig, mi)
spec.CreationTime = self.creationTime
spec.HasFilesystem = false
switch self.storageDriver {
case aufsStorageDriver:
case overlayStorageDriver:
case aufsStorageDriver, overlayStorageDriver:
spec.HasFilesystem = true
default:
spec.HasFilesystem = false
}
spec.Labels = self.labels
@ -250,9 +250,7 @@ func (self *dockerContainerHandler) GetSpec() (info.ContainerSpec, error) {
func (self *dockerContainerHandler) getFsStats(stats *info.ContainerStats) error {
switch self.storageDriver {
case aufsStorageDriver:
case overlayStorageDriver:
break
case aufsStorageDriver, overlayStorageDriver:
default:
return nil
}