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

Merge pull request #24479 from Luap99/volume-ls-race

Browse Source 
volume ls: fix race that caused it to fail
This commit is contained in:
openshift-merge-bot[bot]
2024-11-06 15:23:37 +00:00
committed by GitHub
parent c0e24c6b60 9a0c0b2eef
commit 5cbb630523
3 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/handlers/compat/volumes.go
View File

@ -60,6 +60,9 @@ func ListVolumes(w http.ResponseWriter, r *http.Request) {
for _, v := range vols {
mp, err := v.MountPoint()
if err != nil {
if errors.Is(err, define.ErrNoSuchVolume) {
continue
}
utils.InternalServerError(w, err)
return
}

26
pkg/api/handlers/libpod/volumes.go
View File

@ -121,33 +121,13 @@ func ListVolumes(w http.ResponseWriter, r *http.Request) {
return
}
volumeFilters := []libpod.VolumeFilter{}
for filter, filterValues := range *filterMap {
filterFunc, err := filters.GenerateVolumeFilters(filter, filterValues, runtime)
if err != nil {
utils.InternalServerError(w, err)
return
}
volumeFilters = append(volumeFilters, filterFunc)
}
vols, err := runtime.Volumes(volumeFilters...)
ic := abi.ContainerEngine{Libpod: runtime}
volumeConfigs, err := ic.VolumeList(r.Context(), entities.VolumeListOptions{Filter: *filterMap})
if err != nil {
utils.InternalServerError(w, err)
return
}
volumeConfigs := make([]*entities.VolumeListReport, 0, len(vols))
for _, v := range vols {
inspectOut, err := v.Inspect()
if err != nil {
utils.InternalServerError(w, err)
return
}
config := entities.VolumeConfigResponse{
InspectVolumeData: *inspectOut,
}
volumeConfigs = append(volumeConfigs, &entities.VolumeListReport{VolumeConfigResponse: config})
}
utils.WriteResponse(w, http.StatusOK, volumeConfigs)
}

3
pkg/domain/infra/abi/volumes.go
View File

@ -164,6 +164,9 @@ func (ic *ContainerEngine) VolumeList(ctx context.Context, opts entities.VolumeL
for _, v := range vols {
inspectOut, err := v.Inspect()
if err != nil {
if errors.Is(err, define.ErrNoSuchVolume) {
continue
}
return nil, err
}
config := entities.VolumeConfigResponse{