opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 18:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10121 from SoMuchForSubtlety/master

Browse Source 
Fix removal race condition in ListContainers
This commit is contained in:
OpenShift Merge Robot
2021-04-23 07:20:49 -04:00
committed by GitHub
parent 8465626e31 2df5c6383f
commit afdea0dccd
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/handlers/compat/containers.go
View File

@ -26,6 +26,7 @@ import (
"github.com/docker/go-units"
"github.com/gorilla/schema"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
func RemoveContainer(w http.ResponseWriter, r *http.Request) {
@ -148,14 +149,19 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
containers = containers[:query.Limit]
}
}
var list = make([]*handlers.Container, len(containers))
for i, ctnr := range containers {
list := make([]*handlers.Container, 0, len(containers))
for _, ctnr := range containers {
api, err := LibpodToContainer(ctnr, query.Size)
if err != nil {
if errors.Cause(err) == define.ErrNoSuchCtr {
// container was removed between the initial fetch of the list and conversion
logrus.Debugf("Container %s removed between initial fetch and conversion, ignoring in output", ctnr.ID())
continue
}
utils.InternalServerError(w, err)
return
}
list[i] = api
list = append(list, api)
}
utils.WriteResponse(w, http.StatusOK, list)
}