Merge pull request #5258 from ipfs/fix/5247

whyrusleeping · web-flow · commit 6f140d2579f3 · 2018-07-18T14:28:29.000-05:00
when sending blocks in bitswap, close streams asynchronously
diff --git a/exchange/bitswap/network/ipfs_impl.go b/exchange/bitswap/network/ipfs_impl.go
@@ -123,9 +123,10 @@ func (bsnet *impl) SendMessage(
 		s.Reset()
 		return err
 	}
-	// Yes, return this error. We have no reason to believe that the block
-	// was actually *sent* unless we see the EOF.
-	return inet.FullClose(s)
+	// TODO(https://github.com/libp2p/go-libp2p-net/issues/28): Avoid this goroutine.
+	go inet.AwaitEOF(s)
+	return s.Close()
+
 }
 
 func (bsnet *impl) SetDelegate(r Receiver) {

Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,10 @@ func (bsnet *impl) SendMessage(`
`123`	`123`	`s.Reset()`
`124`	`124`	`return err`
`125`	`125`	`}`
`126`		`- // Yes, return this error. We have no reason to believe that the block`
`127`		`- // was actually sent unless we see the EOF.`
`128`		`- return inet.FullClose(s)`
	`126`	`+ // TODO(https://github.com/libp2p/go-libp2p-net/issues/28): Avoid this goroutine.`
	`127`	`+ go inet.AwaitEOF(s)`
	`128`	`+ return s.Close()`
	`129`	`+`
`129`	`130`	`}`
`130`	`131`
`131`	`132`	`func (bsnet *impl) SetDelegate(r Receiver) {`