X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b01138f2ed3b666fd6075a6d77caddb5d5ca91e1..17014a715c21dd85a02c34b807b8c362c8706cf1:/services/keepstore/trash_worker.go

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index bc99e9657a..72b9a4663a 100644
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
 	"log"
 	"time"
 )
@@ -14,17 +13,7 @@ import (
 		Repeat
 */
 
-var defaultTrashLifetime int64 = 0
-
-func RunTrashWorker(arv *arvadosclient.ArvadosClient, trashq *WorkQueue) {
-	if arv != nil {
-		defaultTrashLifetimeMap, err := arv.Discovery("defaultTrashLifetime")
-		if err != nil {
-			log.Fatalf("Error setting up arvados client %s", err.Error())
-		}
-		defaultTrashLifetime = int64(defaultTrashLifetimeMap["defaultTrashLifetime"].(float64))
-	}
-
+func RunTrashWorker(trashq *WorkQueue) {
 	nextItem := trashq.NextItem
 	for item := range nextItem {
 		trashRequest := item.(TrashRequest)
@@ -45,7 +34,7 @@ func TrashItem(trashRequest TrashRequest) (err error) {
 		if err == nil {
 			if trashRequest.BlockMtime == mtime.Unix() {
 				currentTime := time.Now().Unix()
-				if (currentTime - trashRequest.BlockMtime) > defaultTrashLifetime {
+				if time.Duration(currentTime-trashRequest.BlockMtime)*time.Second >= permission_ttl {
 					err = volume.Delete(trashRequest.Locator)
 				}
 			}