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

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index 65e3fbd284..4063765726 100644
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -1,9 +1,15 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
 	"errors"
-	"log"
 	"time"
+
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"github.com/sirupsen/logrus"
 )
 
 // RunTrashWorker is used by Keepstore to initiate trash worker channel goroutine.
@@ -12,48 +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) {
-	reqMtime := time.Unix(trashRequest.BlockMtime, 0)
-	if time.Since(reqMtime) < blobSignatureTTL {
-		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),
+func TrashItem(volmgr *RRVolumeManager, logger logrus.FieldLogger, cluster *arvados.Cluster, trashRequest TrashRequest) {
+	reqMtime := time.Unix(0, trashRequest.BlockMtime)
+	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,
-			blobSignatureTTL)
+			cluster.Collections.BlobSigningTTL)
+		return
+	}
+
+	var volumes []*VolumeMount
+	if uuid := trashRequest.MountUUID; uuid == "" {
+		volumes = volmgr.AllWritable()
+	} else if mnt := volmgr.Lookup(uuid, true); mnt == nil {
+		logger.Warnf("trash request for nonexistent mount: %v", trashRequest)
 		return
+	} else {
+		volumes = []*VolumeMount{mnt}
 	}
 
-	for _, volume := range KeepVM.AllWritable() {
+	for _, volume := range volumes {
 		mtime, err := volume.Mtime(trashRequest.Locator)
 		if err != nil {
-			log.Printf("%v Delete(%v): %v", volume, trashRequest.Locator, err)
+			logger.WithError(err).Errorf("%v Trash(%v)", volume, trashRequest.Locator)
 			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)
+		if trashRequest.BlockMtime != mtime.UnixNano() {
+			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 neverDelete {
-			err = errors.New("did not delete block because neverDelete is true")
+		if !cluster.Collections.BlobTrash {
+			err = errors.New("skipping because Collections.BlobTrash is false")
 		} else {
-			err = volume.Delete(trashRequest.Locator)
+			err = volume.Trash(trashRequest.Locator)
 		}
 
 		if err != nil {
-			log.Printf("%v Delete(%v): %v", volume, trashRequest.Locator, err)
+			logger.WithError(err).Errorf("%v Trash(%v)", volume, trashRequest.Locator)
 		} else {
-			log.Printf("%v Delete(%v) OK", volume, trashRequest.Locator)
+			logger.Infof("%v Trash(%v) OK", volume, trashRequest.Locator)
 		}
 	}
 }