X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/257d60253246952b435cea23b1912af80ea2c6d6..7692a12d05d54f0e209dcc2ff9ae9152560c7d52:/services/keepstore/trash_worker.go

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index d11bc05192..696c3e53a6 100644
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -2,8 +2,10 @@ package main
 
 import (
 	"errors"
-	"log"
 	"time"
+
+	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	log "github.com/Sirupsen/logrus"
 )
 
 // RunTrashWorker is used by Keepstore to initiate trash worker channel goroutine.
@@ -23,13 +25,13 @@ func RunTrashWorker(trashq *WorkQueue) {
 // TrashItem deletes the indicated block from every writable volume.
 func TrashItem(trashRequest TrashRequest) {
 	reqMtime := time.Unix(0, trashRequest.BlockMtime)
-	if time.Since(reqMtime) < blobSignatureTTL {
+	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.",
-			time.Since(reqMtime),
+			arvados.Duration(time.Since(reqMtime)),
 			trashRequest.Locator,
 			trashRequest.BlockMtime,
 			reqMtime,
-			blobSignatureTTL)
+			theConfig.BlobSignatureTTL)
 		return
 	}
 
@@ -44,8 +46,8 @@ func TrashItem(trashRequest TrashRequest) {
 			continue
 		}
 
-		if neverDelete {
-			err = errors.New("did not delete block because neverDelete is true")
+		if !theConfig.EnableDelete {
+			err = errors.New("did not delete block because EnableDelete is false")
 		} else {
 			err = volume.Trash(trashRequest.Locator)
 		}