Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: applying 1.9.3 hotfixes to main branch #3423

Merged
merged 10 commits into from
May 31, 2023
Merged

chore: applying 1.9.3 hotfixes to main branch #3423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e9f2174
chore: batch event schema messages for faster processing (#3406)
atzoum May 29, 2023
0beb455
fix: stats duplicated labels (#3411)
fracasula May 29, 2023
04e551a
chore: release 1.9.1 (#3410)
devops-github-rudderstack May 29, 2023
99b7e62
fix: jobsforwarder panics with slice bounds out of range (#3414)
atzoum May 29, 2023
585ea96
chore: release 1.9.2 (#3415)
devops-github-rudderstack May 29, 2023
f2dc53c
fix(batchrouter): batchrouter stops processing events for destination…
atzoum May 31, 2023
dfc15e1
chore: release 1.9.3 (#3422)
devops-github-rudderstack May 31, 2023
d72697a
Merge remote-tracking branch 'origin/master' into hotfix.1.9.3
atzoum May 31, 2023
f608ea3
Merge branch 'master' into hotfix.1.9.3
atzoum May 31, 2023
36c9c51
Merge branch 'master' into hotfix.1.9.3
atzoum May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)


Expand Down
6 changes: 3 additions & 3 deletions router/batchrouter/handle_lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}),
Expand All @@ -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}),
Expand All @@ -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}),
Expand Down
4 changes: 4 additions & 0 deletions utils/sync/limiter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import (
"container/heap"
"context"
"fmt"
"sync"
"time"

Expand Down Expand Up @@ -68,6 +69,9 @@

// 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))

Check warning on line 73 in utils/sync/limiter.go

View check run for this annotation

Codecov / codecov/patch

utils/sync/limiter.go#L73 

Added line #L73 was not covered by tests
}
l := &limiter{
name: name,
limit: limit,
Expand Down
Loading