Refactor the multi-host salt install page.

[arvados.git] / services / keepstore / trash_worker.go

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index 696c3e53a60abbd352efc035f5a0bb1afaec737f..3909d90d9204d55a80252449abb88e953ace1b24 100644 (file)
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -1,11 +1,15 @@
-package main
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+package keepstore
 
 import (
        "errors"
        "time"
 
-       "git.curoverse.com/arvados.git/sdk/go/arvados"
-       log "github.com/Sirupsen/logrus"
+       "git.arvados.org/arvados.git/sdk/go/arvados"
+       "github.com/sirupsen/logrus"
 )
 
 // RunTrashWorker is used by Keepstore to initiate trash worker channel goroutine.
@@ -14,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) {
+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 []*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.UnixNano() {
-                       log.Printf("%v Delete(%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("did not delete block 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 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)
                }
        }
 }