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

feat: add trigger config deadletter and order event #643

Merged
merged 2 commits into from
Oct 25, 2023
Merged

feat: add trigger config deadletter and order event #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edb7a91
feat: add trigger config deadletter and order event
xdlbdy Oct 25, 2023
0521622
feat: add trigger config deadletter and order event
xdlbdy Oct 25, 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
4 changes: 3 additions & 1 deletion server/trigger/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,7 @@ type Config struct {
// var client read event from segment batch size.
PullEventBatchSize int `yaml:"pull_event_batch_size"`
// max uack event number
MaxUACKEventNumber int `yaml:"max_uack_event_number"`
MaxUACKEventNumber int `yaml:"max_uack_event_number"`
DisableDeadLetter *bool `yaml:"disable_dead_letter"`
OrderEvent *bool `yaml:"order_event"`
}
8 changes: 6 additions & 2 deletions server/trigger/trigger/trigger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,9 @@ func (t *trigger) writeEventToRetry(ctx context.Context, e *ce.Event, attempts i
for {
writeAttempt++
startTime := time.Now()
_, err := api.AppendOne(ctx, t.timerEventWriter, e)
timeoutCtx, cancel := context.WithTimeout(ctx, t.getConfig().DeliveryTimeout)
_, err := api.AppendOne(timeoutCtx, t.timerEventWriter, e)
cancel()
metrics.TriggerRetryEventAppendSecond.WithLabelValues(t.subscriptionIDStr).
Observe(time.Since(startTime).Seconds())
if err != nil {
Expand Down Expand Up @@ -534,7 +536,9 @@ func (t *trigger) writeEventToDeadLetter(ctx context.Context, e *ce.Event, reaso
for {
writeAttempt++
startTime := time.Now()
_, err := api.AppendOne(ctx, t.dlEventWriter, e)
timeoutCtx, cancel := context.WithTimeout(ctx, t.getConfig().DeliveryTimeout)
_, err := api.AppendOne(timeoutCtx, t.dlEventWriter, e)
cancel()
metrics.TriggerDeadLetterEventAppendSecond.WithLabelValues(t.subscriptionIDStr).
Observe(time.Since(startTime).Seconds())
if err != nil {
Expand Down
13 changes: 11 additions & 2 deletions server/trigger/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,20 @@ func (w *worker) getAllSubscriptionInfo(ctx context.Context) []*metapb.Subscript
func (w *worker) getTriggerOptions(subscription *primitive.Subscription) []trigger.Option {
opts := []trigger.Option{trigger.WithControllers(w.config.ControllerAddr)}
config := subscription.Config
// todo use subscription config replace global config
disableDeadLetter := config.DisableDeadLetter
if w.config.DisableDeadLetter != nil {
disableDeadLetter = *w.config.DisableDeadLetter
}
orderEvent := config.OrderedEvent
if w.config.OrderEvent != nil {
orderEvent = *w.config.OrderEvent
}
opts = append(opts, trigger.WithRateLimit(config.RateLimit),
trigger.WithDeliveryTimeout(config.DeliveryTimeout),
trigger.WithMaxRetryAttempts(config.GetMaxRetryAttempts()),
trigger.WithDisableDeadLetter(config.DisableDeadLetter),
trigger.WithOrdered(config.OrderedEvent),
trigger.WithDisableDeadLetter(disableDeadLetter),
trigger.WithOrdered(orderEvent),
trigger.WithGoroutineSize(w.config.SendEventGoroutineSize),
trigger.WithSendBatchSize(w.config.SendEventBatchSize),
trigger.WithPullBatchSize(w.config.PullEventBatchSize),
Expand Down
Loading