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

Merge pull request #5907 from sujil02/systemprune-v2

Browse Source 
Adding system prune for podman v2
This commit is contained in:
OpenShift Merge Robot
2020-04-28 18:11:39 +02:00
committed by GitHub
parent 5077aece7e 5436e31441
commit 4ed125f7b5
9 changed files with 279 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/api/handlers/compat/containers_prune.go
View File

@ -38,21 +38,24 @@ func PruneContainers(w http.ResponseWriter, r *http.Request) {
filterFuncs = append(filterFuncs, generatedFunc)
}
}
prunedContainers, pruneErrors, err := runtime.PruneContainers(filterFuncs)
if err != nil {
utils.InternalServerError(w, err)
return
}
// Libpod response differs
if utils.IsLibpodRequest(r) {
report := &entities.ContainerPruneReport{
Err: pruneErrors,
ID: prunedContainers,
report, err := PruneContainersHelper(w, r, filterFuncs)
if err != nil {
utils.InternalServerError(w, err)
return
}
utils.WriteResponse(w, http.StatusOK, report)
return
}
prunedContainers, pruneErrors, err := runtime.PruneContainers(filterFuncs)
if err != nil {
utils.InternalServerError(w, err)
return
}
for ctrID, size := range prunedContainers {
if pruneErrors[ctrID] == nil {
space += size
@ -65,3 +68,19 @@ func PruneContainers(w http.ResponseWriter, r *http.Request) {
}
utils.WriteResponse(w, http.StatusOK, report)
}
func PruneContainersHelper(w http.ResponseWriter, r *http.Request, filterFuncs []libpod.ContainerFilter) (
*entities.ContainerPruneReport, error) {
runtime := r.Context().Value("runtime").(*libpod.Runtime)
prunedContainers, pruneErrors, err := runtime.PruneContainers(filterFuncs)
if err != nil {
utils.InternalServerError(w, err)
return nil, err
}
report := &entities.ContainerPruneReport{
Err: pruneErrors,
ID: prunedContainers,
}
return report, nil
}

14
pkg/api/handlers/libpod/pods.go
View File

@ -231,14 +231,22 @@ func PodRestart(w http.ResponseWriter, r *http.Request) {
}
func PodPrune(w http.ResponseWriter, r *http.Request) {
reports, err := PodPruneHelper(w, r)
if err != nil {
utils.InternalServerError(w, err)
return
}
utils.WriteResponse(w, http.StatusOK, reports)
}
func PodPruneHelper(w http.ResponseWriter, r *http.Request) ([]*entities.PodPruneReport, error) {
var (
runtime = r.Context().Value("runtime").(*libpod.Runtime)
reports []*entities.PodPruneReport
)
responses, err := runtime.PrunePods(r.Context())
if err != nil {
utils.InternalServerError(w, err)
return
return nil, err
}
for k, v := range responses {
reports = append(reports, &entities.PodPruneReport{
@ -246,7 +254,7 @@ func PodPrune(w http.ResponseWriter, r *http.Request) {
Id: k,
})
}
utils.WriteResponse(w, http.StatusOK, reports)
return reports, nil
}
func PodPause(w http.ResponseWriter, r *http.Request) {

71
pkg/api/handlers/libpod/system.go Normal file
View File

@ -0,0 +1,71 @@
package libpod
import (
"net/http"
"github.com/containers/libpod/libpod"
"github.com/containers/libpod/pkg/api/handlers/compat"
"github.com/containers/libpod/pkg/api/handlers/utils"
"github.com/containers/libpod/pkg/domain/entities"
"github.com/gorilla/schema"
"github.com/pkg/errors"
)
// SystemPrune removes unused data
func SystemPrune(w http.ResponseWriter, r *http.Request) {
var (
decoder = r.Context().Value("decoder").(*schema.Decoder)
runtime = r.Context().Value("runtime").(*libpod.Runtime)
systemPruneReport = new(entities.SystemPruneReport)
)
query := struct {
All bool `schema:"all"`
Volumes bool `schema:"volumes"`
}{}
if err := decoder.Decode(&query, r.URL.Query()); err != nil {
utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest,
errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
return
}
podPruneReport, err := PodPruneHelper(w, r)
if err != nil {
utils.InternalServerError(w, err)
return
}
systemPruneReport.PodPruneReport = podPruneReport
// We could parallelize this, should we?
containerPruneReport, err := compat.PruneContainersHelper(w, r, nil)
if err != nil {
utils.InternalServerError(w, err)
return
}
systemPruneReport.ContainerPruneReport = containerPruneReport
results, err := runtime.ImageRuntime().PruneImages(r.Context(), query.All, nil)
if err != nil {
utils.InternalServerError(w, err)
return
}
report := entities.ImagePruneReport{
Report: entities.Report{
Id: results,
Err: nil,
},
}
systemPruneReport.ImagePruneReport = &report
if query.Volumes {
volumePruneReport, err := pruneVolumesHelper(w, r)
if err != nil {
utils.InternalServerError(w, err)
return
}
systemPruneReport.VolumePruneReport = volumePruneReport
}
utils.WriteResponse(w, http.StatusOK, systemPruneReport)
}

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

@ -147,14 +147,22 @@ func ListVolumes(w http.ResponseWriter, r *http.Request) {
}
func PruneVolumes(w http.ResponseWriter, r *http.Request) {
reports, err := pruneVolumesHelper(w, r)
if err != nil {
utils.InternalServerError(w, err)
return
}
utils.WriteResponse(w, http.StatusOK, reports)
}
func pruneVolumesHelper(w http.ResponseWriter, r *http.Request) ([]*entities.VolumePruneReport, error) {
var (
runtime = r.Context().Value("runtime").(*libpod.Runtime)
reports []*entities.VolumePruneReport
)
pruned, err := runtime.PruneVolumes(r.Context())
if err != nil {
utils.InternalServerError(w, err)
return
return nil, err
}
for k, v := range pruned {
reports = append(reports, &entities.VolumePruneReport{
@ -162,9 +170,8 @@ func PruneVolumes(w http.ResponseWriter, r *http.Request) {
Id: k,
})
}
utils.WriteResponse(w, http.StatusOK, reports)
return reports, nil
}
func RemoveVolume(w http.ResponseWriter, r *http.Request) {
var (
runtime = r.Context().Value("runtime").(*libpod.Runtime)

17
pkg/api/server/register_system.go
View File

@ -4,6 +4,7 @@ import (
"net/http"
"github.com/containers/libpod/pkg/api/handlers/compat"
"github.com/containers/libpod/pkg/api/handlers/libpod"
"github.com/gorilla/mux"
)
@ -11,5 +12,21 @@ func (s *APIServer) registerSystemHandlers(r *mux.Router) error {
r.Handle(VersionedPath("/system/df"), s.APIHandler(compat.GetDiskUsage)).Methods(http.MethodGet)
// Added non version path to URI to support docker non versioned paths
r.Handle("/system/df", s.APIHandler(compat.GetDiskUsage)).Methods(http.MethodGet)
// Swagger:operation POST /libpod/system/prune libpod pruneSystem
// ---
// tags:
// - system
// summary: Prune unused data
// produces:
// - application/json
// responses:
// 200:
// $ref: '#/responses/SystemPruneReport'
// 400:
// $ref: "#/responses/BadParamError"
// 500:
// $ref: "#/responses/InternalError"
r.Handle(VersionedPath("/libpod/system/prune"), s.APIHandler(libpod.SystemPrune)).Methods(http.MethodPost)
return nil
}