Skip to content

routing/http: fix goroutine/memory leak [skip changelog] #618

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

Merged
aschmahmann merged 1 commit into from
Jun 17, 2024
Merged

routing/http: fix goroutine/memory leak [skip changelog] #618

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
19 changes: 13 additions & 6 deletions routing/http/contentrouter/contentrouter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (c *contentRouter) Ready() bool {

// readProviderResponses reads peer records (and bitswap records for legacy
// compatibility) from the iterator into the given channel.
func readProviderResponses(iter iter.ResultIter[types.Record], ch chan<- peer.AddrInfo) {
func readProviderResponses(ctx context.Context, iter iter.ResultIter[types.Record], ch chan<- peer.AddrInfo) {
defer close(ch)
defer iter.Close()
for iter.Next() {
Expand All @@ -140,10 +140,14 @@ func readProviderResponses(iter iter.ResultIter[types.Record], ch chan<- peer.Ad
addrs = append(addrs, a.Multiaddr)
}

ch <- peer.AddrInfo{
select {
case <-ctx.Done():
return
case ch <- peer.AddrInfo{
ID: *result.ID,
Addrs: addrs,
Addrs: addrs}:
}

//lint:ignore SA1019 // ignore staticcheck
case types.SchemaBitswap:
//lint:ignore SA1019 // ignore staticcheck
Expand All @@ -162,9 +166,12 @@ func readProviderResponses(iter iter.ResultIter[types.Record], ch chan<- peer.Ad
addrs = append(addrs, a.Multiaddr)
}

ch <- peer.AddrInfo{
select {
case <-ctx.Done():
return
case ch <- peer.AddrInfo{
ID: *result.ID,
Addrs: addrs,
Addrs: addrs}:
}
}
}
Expand All @@ -179,7 +186,7 @@ func (c *contentRouter) FindProvidersAsync(ctx context.Context, key cid.Cid, num
return ch
}
ch := make(chan peer.AddrInfo)
go readProviderResponses(resultsIter, ch)
go readProviderResponses(ctx, resultsIter, ch)
return ch
}

Expand Down