21205: Now adds the final part of the uuid to make the name unique

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

diff --git a/services/keepstore/command.go b/services/keepstore/command.go
index 9d220022ab3cf5e05508cc36d2268ca94b08fae9..db387f494b06c8d8b4e3fc1b38f7732e187e767f 100644 (file)
--- a/services/keepstore/command.go
+++ b/services/keepstore/command.go
@@ -186,7 +186,7 @@ func (h *handler) setup(ctx context.Context, cluster *arvados.Cluster, token str
 
        // Initialize the trashq and workers
        h.trashq = NewWorkQueue()
-       for i := 0; i < 1 || i < h.Cluster.Collections.BlobTrashConcurrency; i++ {
+       for i := 0; i < h.Cluster.Collections.BlobTrashConcurrency; i++ {
                go RunTrashWorker(h.volmgr, h.Logger, h.Cluster, h.trashq)
        }
 
@@ -211,7 +211,7 @@ func (h *handler) setup(ctx context.Context, cluster *arvados.Cluster, token str
        if d := h.Cluster.Collections.BlobTrashCheckInterval.Duration(); d > 0 &&
                h.Cluster.Collections.BlobTrash &&
                h.Cluster.Collections.BlobDeleteConcurrency > 0 {
-               go emptyTrash(h.volmgr.writables, d)
+               go emptyTrash(h.volmgr.mounts, d)
        }
 
        return nil