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

diff --git a/services/keepstore/command.go b/services/keepstore/command.go
index 51031d3607..bf3bf1722c 100644
--- a/services/keepstore/command.go
+++ b/services/keepstore/command.go
@@ -15,12 +15,12 @@ import (
 	"os"
 	"sync"
 
-	"git.curoverse.com/arvados.git/lib/config"
-	"git.curoverse.com/arvados.git/lib/service"
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
-	"git.curoverse.com/arvados.git/sdk/go/keepclient"
+	"git.arvados.org/arvados.git/lib/config"
+	"git.arvados.org/arvados.git/lib/service"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvadosclient"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
+	"git.arvados.org/arvados.git/sdk/go/keepclient"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
 )
@@ -72,8 +72,8 @@ func convertKeepstoreFlagsToServiceFlags(args []string, lgr logrus.FieldLogger)
 	flags.String("s3-bucket-volume", "", "Volumes.*.DriverParameters.Bucket")
 	flags.String("s3-region", "", "Volumes.*.DriverParameters.Region")
 	flags.String("s3-endpoint", "", "Volumes.*.DriverParameters.Endpoint")
-	flags.String("s3-access-key-file", "", "Volumes.*.DriverParameters.AccessKey")
-	flags.String("s3-secret-key-file", "", "Volumes.*.DriverParameters.SecretKey")
+	flags.String("s3-access-key-file", "", "Volumes.*.DriverParameters.AccessKeyID")
+	flags.String("s3-secret-key-file", "", "Volumes.*.DriverParameters.SecretAccessKey")
 	flags.String("s3-race-window", "", "Volumes.*.DriverParameters.RaceWindow")
 	flags.String("s3-replication", "", "Volumes.*.Replication")
 	flags.String("s3-unsafe-delete", "", "Volumes.*.DriverParameters.UnsafeDelete")
@@ -132,6 +132,10 @@ func (h *handler) CheckHealth() error {
 	return h.err
 }
 
+func (h *handler) Done() <-chan struct{} {
+	return nil
+}
+
 func newHandlerOrErrorHandler(ctx context.Context, cluster *arvados.Cluster, token string, reg *prometheus.Registry) service.Handler {
 	var h handler
 	serviceURL, ok := service.URLFromContext(ctx)
@@ -149,13 +153,12 @@ 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)
+	if h.Cluster.API.MaxConcurrentRequests > 0 && h.Cluster.API.MaxConcurrentRequests < h.Cluster.API.MaxKeepBlobBuffers {
+		h.Logger.Warnf("Possible configuration mistake: not useful to set API.MaxKeepBlobBuffers (%d) higher than API.MaxConcurrentRequests (%d)", h.Cluster.API.MaxKeepBlobBuffers, h.Cluster.API.MaxConcurrentRequests)
 	}
 
 	if h.Cluster.Collections.BlobSigningKey != "" {
@@ -190,7 +193,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