X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e6dcabea4865284e34efc50eda6e92b062b7adda..a098a3a28cbf70895668cb052e9676a29ef6f764:/services/keepstore/trash_worker.go

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index 8a9fedfb70..4063765726 100644
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -8,7 +8,8 @@ import (
 	"errors"
 	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"github.com/sirupsen/logrus"
 )
 
 // RunTrashWorker is used by Keepstore to initiate trash worker channel goroutine.
@@ -17,58 +18,58 @@ import (
 //      Delete the block indicated by the trash request Locator
 //		Repeat
 //
-func RunTrashWorker(trashq *WorkQueue) {
+func RunTrashWorker(volmgr *RRVolumeManager, logger logrus.FieldLogger, cluster *arvados.Cluster, trashq *WorkQueue) {
 	for item := range trashq.NextItem {
 		trashRequest := item.(TrashRequest)
-		TrashItem(trashRequest)
+		TrashItem(volmgr, logger, cluster, trashRequest)
 		trashq.DoneItem <- struct{}{}
 	}
 }
 
 // TrashItem deletes the indicated block from every writable volume.
-func TrashItem(trashRequest TrashRequest) {
+func TrashItem(volmgr *RRVolumeManager, logger logrus.FieldLogger, cluster *arvados.Cluster, trashRequest TrashRequest) {
 	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.",
+	if time.Since(reqMtime) < cluster.Collections.BlobSigningTTL.Duration() {
+		logger.Warnf("client 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,
-			theConfig.BlobSignatureTTL)
+			cluster.Collections.BlobSigningTTL)
 		return
 	}
 
-	var volumes []Volume
+	var volumes []*VolumeMount
 	if uuid := trashRequest.MountUUID; uuid == "" {
-		volumes = KeepVM.AllWritable()
-	} else if v := KeepVM.Lookup(uuid, true); v == nil {
-		log.Printf("warning: trash request for nonexistent mount: %v", trashRequest)
+		volumes = volmgr.AllWritable()
+	} else if mnt := volmgr.Lookup(uuid, true); mnt == nil {
+		logger.Warnf("trash request for nonexistent mount: %v", trashRequest)
 		return
 	} else {
-		volumes = []Volume{v}
+		volumes = []*VolumeMount{mnt}
 	}
 
 	for _, volume := range volumes {
 		mtime, err := volume.Mtime(trashRequest.Locator)
 		if err != nil {
-			log.Printf("%v Trash(%v): %v", volume, trashRequest.Locator, err)
+			logger.WithError(err).Errorf("%v Trash(%v)", volume, trashRequest.Locator)
 			continue
 		}
 		if trashRequest.BlockMtime != mtime.UnixNano() {
-			log.Printf("%v Trash(%v): stored mtime %v does not match trash list value %v", volume, trashRequest.Locator, mtime.UnixNano(), trashRequest.BlockMtime)
+			logger.Infof("%v Trash(%v): stored mtime %v does not match trash list value %v; skipping", volume, trashRequest.Locator, mtime.UnixNano(), trashRequest.BlockMtime)
 			continue
 		}
 
-		if !theConfig.EnableDelete {
-			err = errors.New("skipping because EnableDelete is false")
+		if !cluster.Collections.BlobTrash {
+			err = errors.New("skipping because Collections.BlobTrash is false")
 		} else {
 			err = volume.Trash(trashRequest.Locator)
 		}
 
 		if err != nil {
-			log.Printf("%v Trash(%v): %v", volume, trashRequest.Locator, err)
+			logger.WithError(err).Errorf("%v Trash(%v)", volume, trashRequest.Locator)
 		} else {
-			log.Printf("%v Trash(%v) OK", volume, trashRequest.Locator)
+			logger.Infof("%v Trash(%v) OK", volume, trashRequest.Locator)
 		}
 	}
 }