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

APIv2:fix: Handle docker volume force as expected

Browse Source 
In response to input regarding the semantic difference for the `force`
parameter for volume removal between Docker and us, this change ensures
that we emulate the Dockr behaviour correctly when this parameter is
specified.

Signed-off-by: Matt Brindley <58414429+maybe-sybr@users.noreply.github.com>
This commit is contained in:
maybe-sybr
2020-07-01 09:49:44 +10:00
parent cb61a2d858
commit 3aa22cb1be
2 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,22 +176,43 @@ func RemoveVolume(w http.ResponseWriter, r *http.Request) {
errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
return
}
/* The implications for `force` differ between Docker and us, so we can't
* simply pass the `force` parameter to `runeimt.RemoveVolume()`.
* Specifically, Docker's behavior seems to be that `force` means "do not
* error on missing volume"; ours means "remove any not-running containers
* using the volume at the same time".
*
* With this in mind, we only consider the `force` query parameter when we
* hunt for specified volume by name, using it to seletively return a 204
* or blow up depending on `force` being truthy or falsey/unset
* respectively.
*/
name := utils.GetName(r)
vol, err := runtime.LookupVolume(name)
if err != nil {
utils.VolumeNotFound(w, name, err)
return
}
if err := runtime.RemoveVolume(r.Context(), vol, query.Force); err != nil {
if err == nil {
// As above, we do not pass `force` from the query parameters here
if err := runtime.RemoveVolume(r.Context(), vol, false); err != nil {
if errors.Cause(err) == define.ErrVolumeBeingUsed {
utils.Error(w, "volumes being used", http.StatusConflict, err)
return
}
} else {
utils.InternalServerError(w, err)
return
}
} else {
// Success
utils.WriteResponse(w, http.StatusNoContent, "")
}
} else {
if !query.Force {
utils.VolumeNotFound(w, name, err)
} else {
// Volume does not exist and `force` is truthy - this emulates what
// Docker would do when told to `force` removal of a nonextant
// volume
utils.WriteResponse(w, http.StatusNoContent, "")
}
}
}
func PruneVolumes(w http.ResponseWriter, r *http.Request) {
var (

5
pkg/api/server/register_volumes.go
View File

@ -186,7 +186,10 @@ func (s *APIServer) registerVolumeHandlers(r *mux.Router) error {
// - in: query
// name: force
// type: boolean
// description: force removal
// description: |
// Force removal of the volume. This actually only causes errors due
// to the names volume not being found to be suppressed, which is the
// behaviour Docker implements.
// produces:
// - application/json
// responses: