15107: Merge branch 'master' into 15107-rails-bad-redirect

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

diff --git a/services/keepstore/command.go b/services/keepstore/command.go
index 51031d3607e9ac810e083832c763be7ff423dfb0..006d2446396d1734cf5e7d9de735a1d339cb3798 100644 (file)
--- a/services/keepstore/command.go
+++ b/services/keepstore/command.go
@@ -149,13 +149,13 @@ func (h *handler) setup(ctx context.Context, cluster *arvados.Cluster, token str
        h.Cluster = cluster
        h.Logger = ctxlog.FromContext(ctx)
        if h.Cluster.API.MaxKeepBlobBuffers <= 0 {
-               return fmt.Errorf("MaxBuffers must be greater than zero")
+               return fmt.Errorf("API.MaxKeepBlobBuffers must be greater than zero")
        }
        bufs = newBufferPool(h.Logger, h.Cluster.API.MaxKeepBlobBuffers, BlockSize)
 
        if h.Cluster.API.MaxConcurrentRequests < 1 {
                h.Cluster.API.MaxConcurrentRequests = h.Cluster.API.MaxKeepBlobBuffers * 2
-               h.Logger.Warnf("MaxRequests <1 or not specified; defaulting to MaxKeepBlobBuffers * 2 == %d", h.Cluster.API.MaxConcurrentRequests)
+               h.Logger.Warnf("API.MaxConcurrentRequests <1 or not specified; defaulting to MaxKeepBlobBuffers * 2 == %d", h.Cluster.API.MaxConcurrentRequests)
        }
 
        if h.Cluster.Collections.BlobSigningKey != "" {
@@ -190,7 +190,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++ {
-               go RunTrashWorker(h.volmgr, h.Cluster, h.trashq)
+               go RunTrashWorker(h.volmgr, h.Logger, h.Cluster, h.trashq)
        }
 
        // Set up routes and metrics