diff options
author | Felix Lange <fjl@users.noreply.github.com> | 2018-10-12 02:32:14 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-12 02:32:14 +0800 |
commit | dcae0d348bb7f5d9052e50a83383a33538ce376a (patch) | |
tree | 9dee15f209bd31c3adf32fef3835a06bda8f18e4 /node/node.go | |
parent | f951e23fb5ad2f7017f314a95287bc0506a67d05 (diff) | |
download | go-tangerine-dcae0d348bb7f5d9052e50a83383a33538ce376a.tar go-tangerine-dcae0d348bb7f5d9052e50a83383a33538ce376a.tar.gz go-tangerine-dcae0d348bb7f5d9052e50a83383a33538ce376a.tar.bz2 go-tangerine-dcae0d348bb7f5d9052e50a83383a33538ce376a.tar.lz go-tangerine-dcae0d348bb7f5d9052e50a83383a33538ce376a.tar.xz go-tangerine-dcae0d348bb7f5d9052e50a83383a33538ce376a.tar.zst go-tangerine-dcae0d348bb7f5d9052e50a83383a33538ce376a.zip |
p2p/simulations: fix a deadlock and clean up adapters (#17891)
This fixes a rare deadlock with the inproc adapter:
- A node is stopped, which acquires Network.lock.
- The protocol code being simulated (swarm/network in my case)
waits for its goroutines to shut down.
- One of those goroutines calls into the simulation to add a peer,
which waits for Network.lock.
The fix for the deadlock is really simple, just release the lock
before stopping the simulation node.
Other changes in this PR clean up the exec adapter so it reports
node startup errors better and remove the docker adapter because
it just adds overhead.
In the exec adapter, node information is now posted to a one-shot
server. This avoids log parsing and allows reporting startup
errors to the simulation host.
A small change in package node was needed because simulation
nodes use port zero. Node.{HTTP,WS}Endpoint now return the live
endpoints after startup by checking the TCP listener.
Diffstat (limited to 'node/node.go')
-rw-r--r-- | node/node.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/node/node.go b/node/node.go index ada383721..85299dba7 100644 --- a/node/node.go +++ b/node/node.go @@ -549,11 +549,23 @@ func (n *Node) IPCEndpoint() string { // HTTPEndpoint retrieves the current HTTP endpoint used by the protocol stack. func (n *Node) HTTPEndpoint() string { + n.lock.Lock() + defer n.lock.Unlock() + + if n.httpListener != nil { + return n.httpListener.Addr().String() + } return n.httpEndpoint } // WSEndpoint retrieves the current WS endpoint used by the protocol stack. func (n *Node) WSEndpoint() string { + n.lock.Lock() + defer n.lock.Unlock() + + if n.wsListener != nil { + return n.wsListener.Addr().String() + } return n.wsEndpoint } |