X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9d4bc458b767e4c05024dfe02207283745e1ba06..0041395d00cda5ddeb488dae2d9fae7b6b437c9d:/services/keepstore/trash_worker.go

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index bc1775f97e..7e19ba41c5 100644
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -1,22 +1,22 @@
 package main
 
 import (
+	"errors"
 	"log"
 	"time"
 )
 
-/*
-	Keepstore initiates trash worker channel goroutine.
-	The channel will process trash list.
-		For each (next) trash request:
-      Delete the block indicated by the trash request Locator
-		Repeat
-*/
-
+// RunTrashWorker is used by Keepstore to initiate trash worker channel goroutine.
+//	The channel will process trash list.
+//		For each (next) trash request:
+//      Delete the block indicated by the trash request Locator
+//		Repeat
+//
 func RunTrashWorker(trashq *WorkQueue) {
 	for item := range trashq.NextItem {
 		trashRequest := item.(TrashRequest)
 		TrashItem(trashRequest)
+		trashq.DoneItem <- struct{}{}
 	}
 }
 
@@ -32,16 +32,28 @@ 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
 		}
-		err = volume.Delete(trashRequest.Locator)
+
+		if never_delete {
+			err = errors.New("did not delete block because never_delete is true")
+		} else {
+			err = volume.Delete(trashRequest.Locator)
+		}
+
 		if err != nil {
 			log.Printf("%v Delete(%v): %v", volume, trashRequest.Locator, err)
-			continue
+		} else {
+			log.Printf("%v Delete(%v) OK", volume, trashRequest.Locator)
 		}
-		log.Printf("%v Delete(%v) OK", volume, trashRequest.Locator)
 	}
 }