forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

les: drop the message if the entire p2p connection is stuck

Browse source
This commit is contained in:
rjl493456442 2020-05-06 18:26:03 +08:00
parent 510b6f90db
commit baeffa1651
2 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
les/peer.go
View file

@ -164,24 +164,6 @@ func (p *peerCommons) queueSend(f func()) bool {
return p.sendQueue.Queue(f) return p.sendQueue.Queue(f)
} }
// mustQueueSend starts a for loop and retry the caching if failed.
// If the stopCh is closed, then it returns.
func (p *peerCommons) mustQueueSend(f func()) {
for {
// Check whether the stopCh is closed.
select {
case <-p.closeCh:
return
default:
}
// If the function is successfully cached, return.
if p.canQueue() && p.queueSend(f) {
return
}
time.Sleep(retrySendCachePeriod)
}
}
// String implements fmt.Stringer. // String implements fmt.Stringer.
func (p *peerCommons) String() string { func (p *peerCommons) String() string {
return fmt.Sprintf("Peer %s [%s]", p.id, fmt.Sprintf("les/%d", p.version)) return fmt.Sprintf("Peer %s [%s]", p.id, fmt.Sprintf("les/%d", p.version))
@ -899,7 +881,7 @@ func (p *clientPeer) updateCapacity(cap uint64) {
var kvList keyValueList var kvList keyValueList
kvList = kvList.add("flowControl/MRR", cap) kvList = kvList.add("flowControl/MRR", cap)
kvList = kvList.add("flowControl/BL", cap*bufLimitRatio) kvList = kvList.add("flowControl/BL", cap*bufLimitRatio)
p.mustQueueSend(func() { p.sendAnnounce(announceData{Update: kvList}) }) p.queueSend(func() { p.sendAnnounce(announceData{Update: kvList}) })
} }
// freezeClient temporarily puts the client in a frozen state which means all // freezeClient temporarily puts the client in a frozen state which means all

2
les/server_handler.go
View file

@ -262,7 +262,7 @@ func (h *serverHandler) handleMsg(p *clientPeer, wg *sync.WaitGroup) error {
h.server.clientPool.requestCost(p, realCost) h.server.clientPool.requestCost(p, realCost)
} }
if reply != nil { if reply != nil {
p.mustQueueSend(func() { p.queueSend(func() {
if err := reply.send(bv); err != nil { if err := reply.send(bv); err != nil {
select { select {
case p.errCh <- err: case p.errCh <- err: