container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-18 08:13:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

podman pod stats: fix race when ctr process exits

Browse source 
Like commit 55749af0c7 but for podman *pod* stats not the normal podman
stats. We must ignore ErrCtrStopped here as well as this will happen
when the container process exited.

While at it remove a useless argument from the function as it was always
nil and restructure the logic flow to make it easier to read.

Fixes #23334

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger 2024-07-22 10:16:18 +02:00
parent 003527fedc
commit 55b6e4c3e8
No known key found for this signature in database
GPG key ID: EB145DD938A3CAF2
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libpod/pod.go
View file

@ -459,7 +459,7 @@ type PodContainerStats struct {
}
// GetPodStats returns the stats for each of its containers
func (p *Pod) GetPodStats(previousContainerStats map[string]*define.ContainerStats) (map[string]*define.ContainerStats, error) {
func (p *Pod) GetPodStats() (map[string]*define.ContainerStats, error) {
p.lock.Lock()
defer p.lock.Unlock()
@ -472,15 +472,15 @@ func (p *Pod) GetPodStats(previousContainerStats map[string]*define.ContainerSta
}
newContainerStats := make(map[string]*define.ContainerStats)
for _, c := range containers {
newStats, err := c.GetContainerStats(previousContainerStats[c.ID()])
// If the container wasn't running, don't include it
// but also suppress the error
if err != nil && !errors.Is(err, define.ErrCtrStateInvalid) {
newStats, err := c.GetContainerStats(nil)
if err != nil {
// If the container wasn't running ignore it
if errors.Is(err, define.ErrCtrStateInvalid) || errors.Is(err, define.ErrCtrStopped) {
continue
}
return nil, err
}
if err == nil {
newContainerStats[c.ID()] = newStats
}
newContainerStats[c.ID()] = newStats
}
return newContainerStats, nil
}

2
pkg/domain/infra/abi/pods_stats.go
View file

@ -38,7 +38,7 @@ func (ic *ContainerEngine) PodStats(ctx context.Context, namesOrIds []string, op
func (ic *ContainerEngine) podsToStatsReport(pods []*libpod.Pod) ([]*entities.PodStatsReport, error) {
reports := []*entities.PodStatsReport{}
for i := range pods { // Access by index to prevent potential loop-variable leaks.
podStats, err := pods[i].GetPodStats(nil)
podStats, err := pods[i].GetPodStats()
if err != nil {
// pod was removed, skip it
if errors.Is(err, define.ErrNoSuchPod) {