Skip to content

fix(router): close Kafka consumer client when subscription ends #3133

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
mwisner wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(router): close Kafka consumer client when subscription ends #3133

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55b18d6
fix(router): close Kafka consumer client when subscription ends
mwisner Jul 31, 2026
4c8226d
refactor(router): use WaitGroup.Go for the Kafka subscription poller
mwisner Jul 31, 2026
fd6fdb2
refactor(router): drive Kafka poller with a merged context
mwisner Aug 6, 2026
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
16 changes: 16 additions & 0 deletions router/pkg/pubsub/kafka/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,22 @@ func (p *ProviderAdapter) Subscribe(ctx context.Context, conf datasource.Subscri

defer p.closeWg.Done()

// The consumer client owns background goroutines, broker connections and buffered
// fetches. It must be closed when the poller stops, otherwise every ended subscription
// leaks a full client for the lifetime of the process. Client.Close is not safe to call
// twice, so guard it with a sync.Once shared with the cancellation hook below.
var closeOnce sync.Once
closeClient := func() { closeOnce.Do(client.Close) }
defer closeClient()

// topicPoller blocks in PollRecords on the adapter (application) context, not the
// subscription context. A subscription that is cancelled while its topic is idle would
// therefore never unblock the poller, so neither the goroutine nor the client would ever
// be reclaimed. Closing the client on subscription cancellation makes the in-flight
// PollRecords return IsClientClosed, so the poller exits promptly and the client is freed.
stopOnCancel := context.AfterFunc(ctx, closeClient)
defer stopOnCancel()

err := p.topicPoller(ctx, client, updater, PollerOpts{providerId: conf.ProviderID()})
if err != nil {
if errors.Is(err, errClientClosed) || errors.Is(err, context.Canceled) {
Expand Down
Loading