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

Do not duplicate Docker container output.

Browse Source 
Since Docker containers are known by more than one name we were
returning them once for every name they're known by. This change makes
the returned containers unique.
This commit is contained in:
Victor Marmol 2014-11-17 10:28:55 -08:00
parent c7886629f8
commit 742bb8c724
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manager/manager.go
View File

@ -269,17 +269,17 @@ func (self *manager) SubcontainersInfo(containerName string, query *info.Contain
} }
func (self *manager) DockerContainersInfo(containerName string, query *info.ContainerInfoRequest) ([]*info.ContainerInfo, error) { func (self *manager) DockerContainersInfo(containerName string, query *info.ContainerInfoRequest) ([]*info.ContainerInfo, error) {
var containers []*containerData var containers map[string]*containerData
err := func() error { err := func() error {
self.containersLock.RLock() self.containersLock.RLock()
defer self.containersLock.RUnlock() defer self.containersLock.RUnlock()
containers = make([]*containerData, 0, len(self.containers)) containers = make(map[string]*containerData, len(self.containers))
if containerName == "/" { if containerName == "/" {
// Get all the Docker containers. // Get all the unique containers in the Docker namespace.
for i := range self.containers { for name, cont := range self.containers {
if docker.IsDockerContainerName(self.containers[i].info.Name) { if name.Namespace == docker.DockerNamespace {
containers = append(containers, self.containers[i]) containers[cont.info.Name] = cont
} }
} }
} else { } else {
@ -289,7 +289,7 @@ func (self *manager) DockerContainersInfo(containerName string, query *info.Cont
Name: containerName, Name: containerName,
}] }]
if ok { if ok {
containers = append(containers, cont) containers[cont.info.Name] = cont
} else { } else {
return fmt.Errorf("unable to find Docker container %q", containerName) return fmt.Errorf("unable to find Docker container %q", containerName)
} }
@ -300,7 +300,13 @@ func (self *manager) DockerContainersInfo(containerName string, query *info.Cont
return nil, err return nil, err
} }
return self.containerDataSliceToContainerInfoSlice(containers, query) // Convert to a slice.
containersSlice := make([]*containerData, 0, len(containers))
for _, cont := range containers {
containersSlice = append(containersSlice, cont)
}
return self.containerDataSliceToContainerInfoSlice(containersSlice, query)
} }
func (self *manager) containerDataSliceToContainerInfoSlice(containers []*containerData, query *info.ContainerInfoRequest) ([]*info.ContainerInfo, error) { func (self *manager) containerDataSliceToContainerInfoSlice(containers []*containerData, query *info.ContainerInfoRequest) ([]*info.ContainerInfo, error) {