Merge pull request #1676 from sashayakovtseva/fix/concurrency-limit

Respect dispatch concurrency limits for clusterdispatch
authzed · Jan 22, 2024 · bdcc2a6 · bdcc2a6
2 parents 8470540 + 9fec6bc
commit bdcc2a6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go
@@ -239,6 +239,9 @@ func (c *Config) Complete(ctx context.Context) (RunnableServer, error) {
 
 	enableGRPCHistogram()
 
+	specificConcurrencyLimits := c.DispatchConcurrencyLimits
+	concurrencyLimits := specificConcurrencyLimits.WithOverallDefaultLimit(c.GlobalDispatchConcurrencyLimit)
+
 	dispatcher := c.Dispatcher
 	if dispatcher == nil {
 		cc, err := c.DispatchCacheConfig.WithRevisionParameters(
@@ -257,9 +260,6 @@ func (c *Config) Complete(ctx context.Context) (RunnableServer, error) {
 			dispatchPresharedKey = c.PresharedSecureKey[0]
 		}
 
-		specificConcurrencyLimits := c.DispatchConcurrencyLimits
-		concurrencyLimits := specificConcurrencyLimits.WithOverallDefaultLimit(c.GlobalDispatchConcurrencyLimit)
-
 		hashringConfigJSON, err := (&consistent.BalancerConfig{
 			ReplicationFactor: c.DispatchHashringReplicationFactor,
 			Spread:            c.DispatchHashringSpread,
@@ -318,6 +318,7 @@ func (c *Config) Complete(ctx context.Context) (RunnableServer, error) {
 			clusterdispatch.PrometheusSubsystem(c.DispatchClusterMetricsPrefix),
 			clusterdispatch.Cache(cdcc),
 			clusterdispatch.RemoteDispatchTimeout(c.DispatchUpstreamTimeout),
+			clusterdispatch.ConcurrencyLimits(concurrencyLimits),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("failed to configure cluster dispatch: %w", err)