projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21126: Add AllowTrashWhenReadOnly flag.
[arvados.git]
/
services
/
keepstore
/
trash_worker.go
diff --git
a/services/keepstore/trash_worker.go
b/services/keepstore/trash_worker.go
index d7c73127eb17caad038f64d50d60414f1db39685..5e8a5a963ceaad37527e652ca19460dce349fcd4 100644
(file)
--- a/
services/keepstore/trash_worker.go
+++ b/
services/keepstore/trash_worker.go
@@
-36,10
+36,12
@@
func TrashItem(volmgr *RRVolumeManager, logger logrus.FieldLogger, cluster *arva
var volumes []*VolumeMount
if uuid := trashRequest.MountUUID; uuid == "" {
var volumes []*VolumeMount
if uuid := trashRequest.MountUUID; uuid == "" {
- volumes = volmgr.
AllWritable
()
- } else if mnt := volmgr.Lookup(uuid,
tru
e); mnt == nil {
+ volumes = volmgr.
Mounts
()
+ } else if mnt := volmgr.Lookup(uuid,
fals
e); mnt == nil {
logger.Warnf("trash request for nonexistent mount: %v", trashRequest)
return
logger.Warnf("trash request for nonexistent mount: %v", trashRequest)
return
+ } else if !mnt.KeepMount.AllowTrash {
+ logger.Warnf("trash request for mount with ReadOnly=true, AllowTrashWhenReadOnly=false: %v", trashRequest)
} else {
volumes = []*VolumeMount{mnt}
}
} else {
volumes = []*VolumeMount{mnt}
}