diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-05 17:29:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-05 17:29:56 +0200 |
commit | 9db97dbab8b777b3c9b868cdab62cb7b46839f95 (patch) | |
tree | cf9556b1c2991fa30b7c23398ec44a636bfbad82 /libpod/pod.go | |
parent | e6235ef8f1a3111f8f1afbb1bf64f0e6da704a5b (diff) | |
parent | b5a235df900a6471895111b4de5f80732f7f563a (diff) | |
download | podman-9db97dbab8b777b3c9b868cdab62cb7b46839f95.tar.gz podman-9db97dbab8b777b3c9b868cdab62cb7b46839f95.tar.bz2 podman-9db97dbab8b777b3c9b868cdab62cb7b46839f95.zip |
Merge pull request #6080 from baude/v2stats
v2 podman stats
Diffstat (limited to 'libpod/pod.go')
-rw-r--r-- | libpod/pod.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libpod/pod.go b/libpod/pod.go index b5a14c165..8eb06ae2f 100644 --- a/libpod/pod.go +++ b/libpod/pod.go @@ -247,14 +247,14 @@ func (p *Pod) InfraContainerID() (string, error) { // PodContainerStats is an organization struct for pods and their containers type PodContainerStats struct { Pod *Pod - ContainerStats map[string]*ContainerStats + ContainerStats map[string]*define.ContainerStats } // GetPodStats returns the stats for each of its containers -func (p *Pod) GetPodStats(previousContainerStats map[string]*ContainerStats) (map[string]*ContainerStats, error) { +func (p *Pod) GetPodStats(previousContainerStats map[string]*define.ContainerStats) (map[string]*define.ContainerStats, error) { var ( ok bool - prevStat *ContainerStats + prevStat *define.ContainerStats ) p.lock.Lock() defer p.lock.Unlock() @@ -266,10 +266,10 @@ func (p *Pod) GetPodStats(previousContainerStats map[string]*ContainerStats) (ma if err != nil { return nil, err } - newContainerStats := make(map[string]*ContainerStats) + newContainerStats := make(map[string]*define.ContainerStats) for _, c := range containers { if prevStat, ok = previousContainerStats[c.ID()]; !ok { - prevStat = &ContainerStats{} + prevStat = &define.ContainerStats{} } newStats, err := c.GetContainerStats(prevStat) // If the container wasn't running, don't include it |