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

Fix case statements dealing with storageDriver

Browse Source 
cf0adcc817 introduced two switch
statements to facilitate the addition of the `overlayStorageDriver`;
unfortunately neither of them conform to the Go switch semantic, which
does not fallthrough unless explicitly requested. In one case this was
innocuous (because a `break` was effectively the same as a no-op) but in
the other it would cause the `HasFilesystem` bool to not be set
appropriately in the case of `aufsStorageDriver` being used.

IMHO it's also more idiomatic to perform the default behaviour in the
default case rather than pre-setting and overriding it.
This commit is contained in:
Jonathan Boulle 2015-12-02 16:04:01 -08:00
parent 0605dc991c
commit 4965f069b7
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 := libcontainerConfigToContainerSpec(libcontainerConfig, mi)
spec.CreationTime = self.creationTime spec.CreationTime = self.creationTime
spec.HasFilesystem = false
switch self.storageDriver { switch self.storageDriver {
case aufsStorageDriver: case aufsStorageDriver, overlayStorageDriver:
case overlayStorageDriver:
spec.HasFilesystem = true spec.HasFilesystem = true
default:
spec.HasFilesystem = false
} }
spec.Labels = self.labels spec.Labels = self.labels
@ -250,9 +250,7 @@ func (self *dockerContainerHandler) GetSpec() (info.ContainerSpec, error) {
func (self *dockerContainerHandler) getFsStats(stats *info.ContainerStats) error { func (self *dockerContainerHandler) getFsStats(stats *info.ContainerStats) error {
switch self.storageDriver { switch self.storageDriver {
case aufsStorageDriver: case aufsStorageDriver, overlayStorageDriver:
case overlayStorageDriver:
break
default: default:
return nil return nil
} }