diff options
author | Lewis Marshall <lewis@lmars.net> | 2017-12-01 19:49:04 +0800 |
---|---|---|
committer | Felix Lange <fjl@users.noreply.github.com> | 2017-12-01 19:49:04 +0800 |
commit | 54aeb8e4c0bb9f0e7a6c67258af67df3b266af3d (patch) | |
tree | 07bd996822874272ef163bedb56a2ade537cf658 /p2p/simulations/adapters/docker.go | |
parent | 73067fd24f39cb7d2cdf63a99f6fdac661f7a8bf (diff) | |
download | go-tangerine-54aeb8e4c0bb9f0e7a6c67258af67df3b266af3d.tar go-tangerine-54aeb8e4c0bb9f0e7a6c67258af67df3b266af3d.tar.gz go-tangerine-54aeb8e4c0bb9f0e7a6c67258af67df3b266af3d.tar.bz2 go-tangerine-54aeb8e4c0bb9f0e7a6c67258af67df3b266af3d.tar.lz go-tangerine-54aeb8e4c0bb9f0e7a6c67258af67df3b266af3d.tar.xz go-tangerine-54aeb8e4c0bb9f0e7a6c67258af67df3b266af3d.tar.zst go-tangerine-54aeb8e4c0bb9f0e7a6c67258af67df3b266af3d.zip |
p2p/simulations: various stability fixes (#15198)
p2p/simulations: introduce dialBan
- Refactor simulations/network connection getters to support
avoiding simultaneous dials between two peers If two peers dial
simultaneously, the connection will be dropped to help avoid
that, we essentially lock the connection object with a
timestamp which serves as a ban on dialing for a period of time
(dialBanTimeout).
- The connection getter InitConn can be wrapped and passed to the
nodes via adapters.NodeConfig#Reachable field and then used by
the respective services when they initiate connections. This
massively stablise the emerging connectivity when running with
hundreds of nodes bootstrapping a network.
p2p: add Inbound public method to p2p.Peer
p2p/simulations: Add server id to logs to support debugging
in-memory network simulations when multiple peers are logging.
p2p: SetupConn now returns error. The dialer checks the error and
only calls resolve if the actual TCP dial fails.
Diffstat (limited to 'p2p/simulations/adapters/docker.go')
-rw-r--r-- | p2p/simulations/adapters/docker.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/p2p/simulations/adapters/docker.go b/p2p/simulations/adapters/docker.go index 022314b3d..8ef5629fb 100644 --- a/p2p/simulations/adapters/docker.go +++ b/p2p/simulations/adapters/docker.go @@ -28,6 +28,7 @@ import ( "strings" "github.com/docker/docker/pkg/reexec" + "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p/discover" ) @@ -94,6 +95,7 @@ func (d *DockerAdapter) NewNode(config *NodeConfig) (Node, error) { conf.Stack.P2P.NoDiscovery = true conf.Stack.P2P.NAT = nil conf.Stack.NoUSB = true + conf.Stack.Logger = log.New("node.id", config.ID.String()) node := &DockerNode{ ExecNode: ExecNode{ |