projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21504: Rewrite arv-mount help for more consistent style
[arvados.git]
/
services
/
keepstore
/
handlers.go
diff --git
a/services/keepstore/handlers.go
b/services/keepstore/handlers.go
index 60fdde89c758c764df43c0e76e48277cf967a2f8..089ebb46da973a34942c23f0ae7ff751686df63d 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"`
}
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
result.Deleted++
} else if os.IsNotExist(err) {
continue
@@
-851,7
+853,7
@@
func newPutProgress(classes []string) putProgress {
//
// The MD5 hash of the BLOCK does not match the argument HASH.
//
//
// The MD5 hash of the BLOCK does not match the argument HASH.
//
-// 50
3
Full
+// 50
7
Full
//
// There was not enough space left in any Keep volume to store
// the object.
//
// There was not enough space left in any Keep volume to store
// the object.