From 448a17ce600823f49658a25914f55c8afd2a7c83 Mon Sep 17 00:00:00 2001 From: Balint Gabor Date: Thu, 13 Sep 2018 10:24:37 +0200 Subject: [PATCH] swarm/network: Address review comments --- swarm/network/fetcher.go | 10 +++++----- swarm/network/stream/syncer.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/swarm/network/fetcher.go b/swarm/network/fetcher.go index c36b5a44ee..35e2f01328 100644 --- a/swarm/network/fetcher.go +++ b/swarm/network/fetcher.go @@ -175,7 +175,7 @@ func (f *Fetcher) run(ctx context.Context, peers *sync.Map) { // incoming offer case source := <-f.offerC: - log.Debug("new source", "peer addr", source, "request addr", f.addr) + log.Trace("new source", "peer addr", source, "request addr", f.addr) // 1) the chunk is offered by a syncing peer // add to known sources sources = append(sources, source) @@ -184,7 +184,7 @@ func (f *Fetcher) run(ctx context.Context, peers *sync.Map) { // incoming request case <-f.requestC: - log.Debug("new request", "request addr", f.addr) + log.Trace("new request", "request addr", f.addr) // 2) chunk is requested, set requested flag // launch a request iff none been launched yet doRequest = !requested @@ -193,19 +193,19 @@ func (f *Fetcher) run(ctx context.Context, peers *sync.Map) { // peer we requested from is gone. fall back to another // and remove the peer from the peers map case id := <-gone: - log.Debug("peer gone", "peer id", id.String(), "request addr", f.addr) + log.Trace("peer gone", "peer id", id.String(), "request addr", f.addr) peers.Delete(id.String()) doRequest = requested // search timeout: too much time passed since the last request, // extend the search to a new peer if we can find one case <-waitC: - log.Debug("search timed out: rerequesting", "request addr", f.addr) + log.Trace("search timed out: rerequesting", "request addr", f.addr) doRequest = requested // all Fetcher context closed, can quit case <-ctx.Done(): - log.Debug("terminate fetcher", "request addr", f.addr) + log.Trace("terminate fetcher", "request addr", f.addr) // TODO: send cancelations to all peers left over in peers map (i.e., those we requested from) return } diff --git a/swarm/network/stream/syncer.go b/swarm/network/stream/syncer.go index 0ae5d09dab..e9811a6785 100644 --- a/swarm/network/stream/syncer.go +++ b/swarm/network/stream/syncer.go @@ -28,7 +28,7 @@ import ( ) const ( - BatchSize = 8 + BatchSize = 128 ) // SwarmSyncerServer implements an Server for history syncing on bins