Skip to content

fix: close subscription resource release #592

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

Open
xdlbdy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: close subscription resource release #592

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 17 additions & 3 deletions internal/trigger/trigger/trigger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,11 @@ func (t *trigger) writeEventToRetry(ctx context.Context, e *ce.Event, attempts i
ec.Extensions[primitive.XVanusEventbus] = t.subscription.RetryEventbusID.Key()
var writeAttempt int
for {
select {
case <-ctx.Done():
return
default:
}
writeAttempt++
startTime := time.Now()
_, err := api.AppendOne(ctx, t.timerEventWriter, e)
Expand All @@ -471,7 +476,9 @@ func (t *trigger) writeEventToRetry(ctx context.Context, e *ce.Event, attempts i
if writeAttempt >= t.config.MaxWriteAttempt {
return
}
time.Sleep(time.Second)
if !util.SleepWithContext(ctx, time.Second) {
return
}
} else {
break
}
Expand All @@ -491,6 +498,11 @@ func (t *trigger) writeEventToDeadLetter(ctx context.Context, e *ce.Event, reaso
ec.Extensions[primitive.DeadLetterReason] = reason
var writeAttempt int
for {
select {
case <-ctx.Done():
return
default:
}
writeAttempt++
startTime := time.Now()
_, err := api.AppendOne(ctx, t.dlEventWriter, e)
Expand All @@ -505,7 +517,9 @@ func (t *trigger) writeEventToDeadLetter(ctx context.Context, e *ce.Event, reaso
if writeAttempt >= t.config.MaxWriteAttempt {
return
}
time.Sleep(time.Second)
if !util.SleepWithContext(ctx, time.Second) {
return
}
} else {
break
}
Expand Down Expand Up @@ -602,12 +616,12 @@ func (t *trigger) Stop(ctx context.Context) error {
t.reader.Close()
t.retryEventReader.Close()
t.stop()
t.pool.Release()
close(t.eventCh)
close(t.retryEventCh)
close(t.sendCh)
close(t.batchSendCh)
t.wg.Wait()
t.pool.Release()
t.offsetManager.Close()
t.state = TriggerStopped
log.Info(ctx).
Expand Down