90caa2cabb
* p2p: new dial scheduler This change replaces the peer-to-peer dial scheduler with a new and improved implementation. The new code is better than the previous implementation in two key aspects: - The time between discovery of a node and dialing that node is significantly lower in the new version. The old dialState kept a buffer of nodes and launched a task to refill it whenever the buffer became empty. This worked well with the discovery interface we used to have, but doesn't really work with the new iterator-based discovery API. - Selection of static dial candidates (created by Server.AddPeer or through static-nodes.json) performs much better for large amounts of static peers. Connections to static nodes are now limited like dynanic dials and can no longer overstep MaxPeers or the dial ratio. * p2p/simulations/adapters: adapt to new NodeDialer interface * p2p: re-add check for self in checkDial * p2p: remove peersetCh * p2p: allow static dials when discovery is disabled * p2p: add test for dialScheduler.removeStatic * p2p: remove blank line * p2p: fix documentation of maxDialPeers * p2p: change "ok" to "added" in static node log * p2p: improve dialTask docs Also increase log level for "Can't resolve node" * p2p: ensure dial resolver is truly nil without discovery * p2p: add "looking for peers" log message * p2p: clean up Server.run comments * p2p: fix maxDialedConns for maxpeers < dialRatio Always allocate at least one dial slot unless dialing is disabled using NoDial or MaxPeers == 0. Most importantly, this fixes MaxPeers == 1 to dedicate the sole slot to dialing instead of listening. * p2p: fix RemovePeer to disconnect the peer again Also make RemovePeer synchronous and add a test. * p2p: remove "Connection set up" log message * p2p: clean up connection logging We previously logged outgoing connection failures up to three times. - in SetupConn() as "Setting up connection failed addr=..." - in setupConn() with an error-specific message and "id=... addr=..." - in dial() as "Dial error task=..." This commit ensures a single log message is emitted per failure and adds "id=... addr=... conn=..." everywhere (id= omitted when the ID isn't known yet). Also avoid printing a log message when a static dial fails but can't be resolved because discv4 is disabled. The light client hit this case all the time, increasing the message count to four lines per failed connection. * p2p: document that RemovePeer blocks
76 lines
2.1 KiB
Go
76 lines
2.1 KiB
Go
// Copyright 2019 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package p2p
|
|
|
|
import (
|
|
"container/heap"
|
|
|
|
"github.com/ethereum/go-ethereum/common/mclock"
|
|
)
|
|
|
|
// expHeap tracks strings and their expiry time.
|
|
type expHeap []expItem
|
|
|
|
// expItem is an entry in addrHistory.
|
|
type expItem struct {
|
|
item string
|
|
exp mclock.AbsTime
|
|
}
|
|
|
|
// nextExpiry returns the next expiry time.
|
|
func (h *expHeap) nextExpiry() mclock.AbsTime {
|
|
return (*h)[0].exp
|
|
}
|
|
|
|
// add adds an item and sets its expiry time.
|
|
func (h *expHeap) add(item string, exp mclock.AbsTime) {
|
|
heap.Push(h, expItem{item, exp})
|
|
}
|
|
|
|
// contains checks whether an item is present.
|
|
func (h expHeap) contains(item string) bool {
|
|
for _, v := range h {
|
|
if v.item == item {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// expire removes items with expiry time before 'now'.
|
|
func (h *expHeap) expire(now mclock.AbsTime, onExp func(string)) {
|
|
for h.Len() > 0 && h.nextExpiry() < now {
|
|
item := heap.Pop(h)
|
|
if onExp != nil {
|
|
onExp(item.(expItem).item)
|
|
}
|
|
}
|
|
}
|
|
|
|
// heap.Interface boilerplate
|
|
func (h expHeap) Len() int { return len(h) }
|
|
func (h expHeap) Less(i, j int) bool { return h[i].exp < h[j].exp }
|
|
func (h expHeap) Swap(i, j int) { h[i], h[j] = h[j], h[i] }
|
|
func (h *expHeap) Push(x interface{}) { *h = append(*h, x.(expItem)) }
|
|
func (h *expHeap) Pop() interface{} {
|
|
old := *h
|
|
n := len(old)
|
|
x := old[n-1]
|
|
*h = old[0 : n-1]
|
|
return x
|
|
}
|