X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/66380d0e89c00559123ceda8e74e3b1487f4a95a..f935965259f9c0476a9c5ffa79e5c27ce9da4800:/services/keepstore/trash_worker.go?ds=sidebyside

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index 52f5e75345..27d6216d01 100644
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -4,51 +4,58 @@ 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
-*/
+	"git.curoverse.com/arvados.git/sdk/go/arvados"
+)
 
+// 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{}{}
 	}
 }
 
 // TrashItem deletes the indicated block from every writable volume.
 func TrashItem(trashRequest TrashRequest) {
-	reqMtime := time.Unix(trashRequest.BlockMtime, 0)
-	if time.Since(reqMtime) < blob_signature_ttl {
-		log.Printf("WARNING: data manager asked to delete a %v old block %v (BlockMtime %d = %v), but my blob_signature_ttl is %v! Skipping.",
-			time.Since(reqMtime),
+	reqMtime := time.Unix(0, trashRequest.BlockMtime)
+	if time.Since(reqMtime) < theConfig.BlobSignatureTTL.Duration() {
+		log.Printf("WARNING: data manager asked to delete a %v old block %v (BlockMtime %d = %v), but my blobSignatureTTL is %v! Skipping.",
+			arvados.Duration(time.Since(reqMtime)),
 			trashRequest.Locator,
 			trashRequest.BlockMtime,
 			reqMtime,
-			blob_signature_ttl)
+			theConfig.BlobSignatureTTL)
 		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.UnixNano() {
+			log.Printf("%v Delete(%v): stored mtime %v does not match trash list value %v", volume, trashRequest.Locator, mtime.UnixNano(), trashRequest.BlockMtime)
 			continue
 		}
 
-		if !never_delete {
-			err = volume.Delete(trashRequest.Locator)
+		if !theConfig.EnableDelete {
+			err = errors.New("did not delete block because EnableDelete is false")
 		} else {
-			err = errors.New("did not delete block because never_delete is true")
+			err = volume.Trash(trashRequest.Locator)
 		}
 
-		if err == nil {
-			log.Printf("%v Delete(%v) OK", volume, trashRequest.Locator)
-		} else {
+		if err != nil {
 			log.Printf("%v Delete(%v): %v", volume, trashRequest.Locator, err)
+		} else {
+			log.Printf("%v Delete(%v) OK", volume, trashRequest.Locator)
 		}
 	}
 }