21126: Add AllowTrashWhenReadOnly flag.

[arvados.git] / services / keepstore / handlers.go

diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index 60fdde89c758c764df43c0e76e48277cf967a2f8..abeb20fe8624a79dfbe0b38159fa98a51119ae39 100644 (file)
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -475,8 +475,10 @@ func (rtr *router) handleDELETE(resp http.ResponseWriter, req *http.Request) {
                Deleted int `json:"copies_deleted"`
                Failed  int `json:"copies_failed"`
        }
-       for _, vol := range rtr.volmgr.AllWritable() {
-               if err := vol.Trash(hash); err == nil {
+       for _, vol := range rtr.volmgr.Mounts() {
+               if !vol.KeepMount.AllowTrash {
+                       continue
+               } else if err := vol.Trash(hash); err == nil {
                        result.Deleted++
                } else if os.IsNotExist(err) {
                        continue