X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0d9da683cb9572f6b5ba3f65376066938e701fb4..23cc1183e500eb6fa22b611c1c6fc60de1aff9e7:/services/keepstore/trash_worker.go

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index 6257f7b470..8f78658c3a 100644
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -18,6 +18,7 @@ func RunTrashWorker(trashq *WorkQueue) {
 	for item := range trashq.NextItem {
 		trashRequest := item.(TrashRequest)
 		TrashItem(trashRequest)
+		trashq.DoneItem <- struct{}{}
 	}
 }
 
@@ -33,9 +34,15 @@ func TrashItem(trashRequest TrashRequest) {
 			blob_signature_ttl)
 		return
 	}
+
 	for _, volume := range KeepVM.AllWritable() {
 		mtime, err := volume.Mtime(trashRequest.Locator)
-		if err != nil || trashRequest.BlockMtime != mtime.Unix() {
+		if err != nil {
+			log.Printf("%v Delete(%v): %v", volume, trashRequest.Locator, err)
+			continue
+		}
+		if trashRequest.BlockMtime != mtime.Unix() {
+			log.Printf("%v Delete(%v): mtime on volume is %v does not match trash list value %v", volume, trashRequest.Locator, mtime.Unix(), trashRequest.BlockMtime)
 			continue
 		}