Merge pull request ipfs#21 from ipfs/fix/fetch-deadlock

fix a fetch deadlock on error
ariescodescream · Nov 28, 2018 · 53eb8d0 · 53eb8d0
2 parents ff7c070 + 3b8c0ad
commit 53eb8d0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/merkledag.go b/merkledag.go
@@ -397,7 +397,10 @@ func EnumerateChildrenAsyncDepth(ctx context.Context, getLinks GetLinks, c cid.C
 				if shouldVisit {
 					links, err := getLinks(ctx, ci)
 					if err != nil {
-						errChan <- err
+						select {
+						case errChan <- err:
+						case <-fetchersCtx.Done():
+						}
 						return
 					}
 

diff --git a/merkledag_test.go b/merkledag_test.go
@@ -677,6 +677,7 @@ func TestEnumerateAsyncFailsNotFound(t *testing.T) {
 	b := NodeWithData([]byte("foo2"))
 	c := NodeWithData([]byte("foo3"))
 	d := NodeWithData([]byte("foo4"))
+	e := NodeWithData([]byte("foo5"))
 
 	ds := dstest.Mock()
 	for _, n := range []ipld.Node{a, b, c} {
@@ -703,6 +704,10 @@ func TestEnumerateAsyncFailsNotFound(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	if err := parent.AddNodeLink("e", e); err != nil {
+		t.Fatal(err)
+	}
+
 	err := ds.Add(ctx, parent)
 	if err != nil {
 		t.Fatal(err)