X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d843787b4ece9952597d7814cbf10fb383c72625..refs/heads/5562-pycurl:/services/keepstore/trash_worker.go

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index 72b9a4663a..ca269126ee 100644
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -29,15 +29,14 @@ func RunTrashWorker(trashq *WorkQueue) {
 */
 func TrashItem(trashRequest TrashRequest) (err error) {
 	// Verify if the block is to be deleted based on its Mtime
-	for _, volume := range KeepVM.Volumes() {
+	for _, volume := range KeepVM.AllWritable() {
 		mtime, err := volume.Mtime(trashRequest.Locator)
-		if err == nil {
-			if trashRequest.BlockMtime == mtime.Unix() {
-				currentTime := time.Now().Unix()
-				if time.Duration(currentTime-trashRequest.BlockMtime)*time.Second >= permission_ttl {
-					err = volume.Delete(trashRequest.Locator)
-				}
-			}
+		if err != nil || trashRequest.BlockMtime != mtime.Unix() {
+			continue
+		}
+		currentTime := time.Now().Unix()
+		if time.Duration(currentTime-trashRequest.BlockMtime)*time.Second >= permission_ttl {
+			err = volume.Delete(trashRequest.Locator)
 		}
 	}
 	return