chore: applying 1.9.3 hotfixes to main branch (#3423)

rudderlabs · May 31, 2023 · ee1630d · ee1630d
1 parent e22c790
commit ee1630d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.9.3](https://github.com/rudderlabs/rudder-server/compare/v1.9.2...v1.9.3) (2023-05-31)
+
+
+### Bug Fixes
+
+* **batchrouter:** batchrouter stops processing events for destinations where a destType-specific config option is set [#3421](https://github.com/rudderlabs/rudder-server/issues/3421) ([f2dc53c](https://github.com/rudderlabs/rudder-server/commit/f2dc53cf6a976c09c6c9f45b0b3d846fbcd55745))
+
 ## [1.9.2](https://github.com/rudderlabs/rudder-server/compare/v1.9.1...v1.9.2) (2023-05-29)
 
 

diff --git a/router/batchrouter/handle_lifecycle.go b/router/batchrouter/handle_lifecycle.go
@@ -142,7 +142,7 @@ func (brt *Handle) Setup(
 	var limiterGroup sync.WaitGroup
 	limiterStatsPeriod := config.GetDuration("BatchRouter.Limiter.statsPeriod", 15, time.Second)
 	brt.limiter.read = miscsync.NewLimiter(ctx, &limiterGroup, "brt_read",
-		getBatchRouterConfigInt(brt.destType, "Limiter.read.limit", 20),
+		getBatchRouterConfigInt("Limiter.read.limit", brt.destType, 20),
 		stats.Default,
 		miscsync.WithLimiterDynamicPeriod(config.GetDuration("BatchRouter.Limiter.read.dynamicPeriod", 1, time.Second)),
 		miscsync.WithLimiterTags(map[string]string{"destType": brt.destType}),
@@ -151,7 +151,7 @@ func (brt *Handle) Setup(
 		}),
 	)
 	brt.limiter.process = miscsync.NewLimiter(ctx, &limiterGroup, "brt_process",
-		getBatchRouterConfigInt(brt.destType, "Limiter.process.limit", 20),
+		getBatchRouterConfigInt("Limiter.process.limit", brt.destType, 20),
 		stats.Default,
 		miscsync.WithLimiterDynamicPeriod(config.GetDuration("BatchRouter.Limiter.process.dynamicPeriod", 1, time.Second)),
 		miscsync.WithLimiterTags(map[string]string{"destType": brt.destType}),
@@ -160,7 +160,7 @@ func (brt *Handle) Setup(
 		}),
 	)
 	brt.limiter.upload = miscsync.NewLimiter(ctx, &limiterGroup, "brt_upload",
-		getBatchRouterConfigInt(brt.destType, "Limiter.upload.limit", 50),
+		getBatchRouterConfigInt("Limiter.upload.limit", brt.destType, 50),
 		stats.Default,
 		miscsync.WithLimiterDynamicPeriod(config.GetDuration("BatchRouter.Limiter.upload.dynamicPeriod", 1, time.Second)),
 		miscsync.WithLimiterTags(map[string]string{"destType": brt.destType}),

diff --git a/utils/sync/limiter.go b/utils/sync/limiter.go
@@ -3,6 +3,7 @@ package sync
 import (
 	"container/heap"
 	"context"
+	"fmt"
 	"sync"
 	"time"
 
@@ -68,6 +69,9 @@ var WithLimiterTags = func(tags stats.Tags) func(*limiter) {
 
 // NewLimiter creates a new limiter
 func NewLimiter(ctx context.Context, wg *sync.WaitGroup, name string, limit int, statsf stats.Stats, opts ...func(*limiter)) Limiter {
+	if limit <= 0 {
+		panic(fmt.Errorf("limit for %q needs to be greater than 0", name))
+	}
 	l := &limiter{
 		name:     name,
 		limit:    limit,