containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23341 from Luap99/stats-err 

podman stats: fix race when ctr process exists
This commit is contained in:
openshift-merge-bot[bot] 2024-07-20 10:26:19 +00:00 committed by GitHub
parent 5e47444a9e 55749af0c7
commit db6f7d5e82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/domain/infra/abi/containers.go
View File

@ -1581,7 +1581,14 @@ func (ic *ContainerEngine) ContainerStats(ctx context.Context, namesOrIds []stri
for _, ctr := range containers {
stats, err := ctr.GetContainerStats(containerStats[ctr.ID()])
if err != nil {
if queryAll && (errors.Is(err, define.ErrCtrRemoved) || errors.Is(err, define.ErrNoSuchCtr) || errors.Is(err, define.ErrCtrStateInvalid)) {
if queryAll &&
// All these errors might happen while we get stats, when we list all
// they must be skipped as they cause podman stats to stop and error otherwise.
// ErrCtrStopped can happen when the container process exited before we could
// update the container state
// https://github.com/containers/podman/issues/23334
(errors.Is(err, define.ErrCtrRemoved) || errors.Is(err, define.ErrNoSuchCtr) ||
errors.Is(err, define.ErrCtrStateInvalid) || errors.Is(err, define.ErrCtrStopped)) {
continue
}
return nil, err