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

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index 72b9a4663a..d7c73127eb 100644
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -1,44 +1,70 @@
-package main
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+package keepstore
 
 import (
-	"log"
+	"errors"
 	"time"
+
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"github.com/sirupsen/logrus"
 )
 
-/*
-	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
-*/
-
-func RunTrashWorker(trashq *WorkQueue) {
-	nextItem := trashq.NextItem
-	for item := range nextItem {
+// RunTrashWorker processes the trash request queue.
+func RunTrashWorker(volmgr *RRVolumeManager, logger logrus.FieldLogger, cluster *arvados.Cluster, trashq *WorkQueue) {
+	for item := range trashq.NextItem {
 		trashRequest := item.(TrashRequest)
-		err := TrashItem(trashRequest)
-		if err != nil {
-			log.Printf("Trash request error for %s: %s", trashRequest, err)
-		}
+		TrashItem(volmgr, logger, cluster, trashRequest)
+		trashq.DoneItem <- struct{}{}
 	}
 }
 
-/*
-	Delete the block indicated by the Locator in TrashRequest.
-*/
-func TrashItem(trashRequest TrashRequest) (err error) {
-	// Verify if the block is to be deleted based on its Mtime
-	for _, volume := range KeepVM.Volumes() {
+// TrashItem deletes the indicated block from every writable volume.
+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,
+			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 volumes {
 		mtime, err := volume.Mtime(trashRequest.Locator)
-		if err == nil {
-			if trashRequest.BlockMtime == mtime.Unix() {
-				currentTime := time.Now().Unix()
-				if time.Duration(currentTime-trashRequest.BlockMtime)*time.Second >= permission_ttl {
-					err = volume.Delete(trashRequest.Locator)
-				}
-			}
+		if err != nil {
+			logger.WithError(err).Errorf("%v Trash(%v)", volume, trashRequest.Locator)
+			continue
+		}
+		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 !cluster.Collections.BlobTrash {
+			err = errors.New("skipping because Collections.BlobTrash is false")
+		} else {
+			err = volume.Trash(trashRequest.Locator)
+		}
+
+		if err != nil {
+			logger.WithError(err).Errorf("%v Trash(%v)", volume, trashRequest.Locator)
+		} else {
+			logger.Infof("%v Trash(%v) OK", volume, trashRequest.Locator)
 		}
 	}
-	return
 }