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 1

swarm/network: traces in fetcher

Browse source
This commit is contained in:
Anton Evangelatov 2019-03-11 16:23:43 +01:00
parent 32933036a7
commit fa1eba41fd
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
swarm/network/fetcher.go
View file

@ -204,24 +204,24 @@ func (f *Fetcher) run(peers *sync.Map) {
// incoming request // incoming request
case hopCount = <-f.requestC: case hopCount = <-f.requestC:
log.Trace("new request", "request addr", f.addr)
// 2) chunk is requested, set requested flag // 2) chunk is requested, set requested flag
// launch a request iff none been launched yet // launch a request iff none been launched yet
doRequest = !requested doRequest = !requested
log.Trace("new request", "request addr", f.addr, "doRequest", doRequest)
requested = true requested = true
// peer we requested from is gone. fall back to another // peer we requested from is gone. fall back to another
// and remove the peer from the peers map // and remove the peer from the peers map
case id := <-gone: case id := <-gone:
log.Trace("peer gone", "peer id", id.String(), "request addr", f.addr)
peers.Delete(id.String()) peers.Delete(id.String())
doRequest = requested doRequest = requested
log.Trace("peer gone", "peer id", id.String(), "request addr", f.addr, "doRequest", doRequest)
// search timeout: too much time passed since the last request, // search timeout: too much time passed since the last request,
// extend the search to a new peer if we can find one // extend the search to a new peer if we can find one
case <-waitC: case <-waitC:
log.Trace("search timed out: requesting", "request addr", f.addr)
doRequest = requested doRequest = requested
log.Trace("search timed out: requesting", "request addr", f.addr, "doRequest", doRequest)
// all Fetcher context closed, can quit // all Fetcher context closed, can quit
case <-f.ctx.Done(): case <-f.ctx.Done():
@ -272,6 +272,8 @@ func (f *Fetcher) run(peers *sync.Map) {
// * the peer's address is removed from prospective sources, and // * the peer's address is removed from prospective sources, and
// * a go routine is started that reports on the gone channel if the peer is disconnected (or terminated their streamer) // * a go routine is started that reports on the gone channel if the peer is disconnected (or terminated their streamer)
func (f *Fetcher) doRequest(gone chan *enode.ID, peersToSkip *sync.Map, sources []*enode.ID, hopCount uint8) ([]*enode.ID, error) { func (f *Fetcher) doRequest(gone chan *enode.ID, peersToSkip *sync.Map, sources []*enode.ID, hopCount uint8) ([]*enode.ID, error) {
log.Trace("fetcher.doRequest", "request addr", f.addr)
var i int var i int
var sourceID *enode.ID var sourceID *enode.ID
var quit chan struct{} var quit chan struct{}