Commit 9eb1a21c authored by Jeromy's avatar Jeromy

merkledag: add a concurrency limit to merkledag fetch graph

License: MIT
Signed-off-by: default avatarJeromy <why@ipfs.io>
parent fdf8dcc9
...@@ -449,6 +449,10 @@ func EnumerateChildrenAsync(ctx context.Context, ds DAGService, c *cid.Cid, visi ...@@ -449,6 +449,10 @@ func EnumerateChildrenAsync(ctx context.Context, ds DAGService, c *cid.Cid, visi
} }
} }
// FetchGraphConcurrency is total number of concurrenct fetches that
// 'fetchNodes' will start at a time
var FetchGraphConcurrency = 8
func fetchNodes(ctx context.Context, ds DAGService, in <-chan []*cid.Cid, out chan<- *NodeOption) { func fetchNodes(ctx context.Context, ds DAGService, in <-chan []*cid.Cid, out chan<- *NodeOption) {
var wg sync.WaitGroup var wg sync.WaitGroup
defer func() { defer func() {
...@@ -458,8 +462,13 @@ func fetchNodes(ctx context.Context, ds DAGService, in <-chan []*cid.Cid, out ch ...@@ -458,8 +462,13 @@ func fetchNodes(ctx context.Context, ds DAGService, in <-chan []*cid.Cid, out ch
close(out) close(out)
}() }()
rateLimit := make(chan struct{}, FetchGraphConcurrency)
get := func(ks []*cid.Cid) { get := func(ks []*cid.Cid) {
defer wg.Done() defer wg.Done()
defer func() {
<-rateLimit
}()
nodes := ds.GetMany(ctx, ks) nodes := ds.GetMany(ctx, ks)
for opt := range nodes { for opt := range nodes {
select { select {
...@@ -471,6 +480,11 @@ func fetchNodes(ctx context.Context, ds DAGService, in <-chan []*cid.Cid, out ch ...@@ -471,6 +480,11 @@ func fetchNodes(ctx context.Context, ds DAGService, in <-chan []*cid.Cid, out ch
} }
for ks := range in { for ks := range in {
select {
case rateLimit <- struct{}{}:
case <-ctx.Done():
return
}
wg.Add(1) wg.Add(1)
go get(ks) go get(ks)
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment