Commit c3efa490 authored by acud's avatar acud Committed by GitHub

reduce pull sync logging (#337)

parent 36018f53
......@@ -346,19 +346,15 @@ func (p *Puller) histSyncWorker(ctx context.Context, peer swarm.Address, bin uin
<-time.After(30 * time.Second)
continue
}
p.logger.Debugf("histSyncWorker peer %s bin %d next interval %d cursor %d", peer, bin, s, cur)
if s > cur {
p.logger.Debugf("histSyncWorker finished syncing bin %d, cursor %d", bin, cur)
return
}
start := time.Now()
top, err := p.syncer.SyncInterval(ctx, peer, bin, s, cur)
if err != nil {
p.logger.Debugf("histSyncWorker error syncing interval. peer %s, bin %d, cursor %d, err %v", peer.String(), bin, cur, err)
return
}
took := time.Since(start)
p.logger.Tracef("histSyncWorker peer %s bin %d synced interval from %d to %d. took %s", peer, bin, s, top, took)
err = p.addPeerInterval(peer, bin, s, top)
if err != nil {
p.logger.Debugf("error persisting interval for peer, quitting")
......@@ -380,7 +376,6 @@ func (p *Puller) liveSyncWorker(ctx context.Context, peer swarm.Address, bin uin
return
default:
}
p.logger.Tracef("liveSyncWorker peer %s syncing bin %d from %d", peer, bin, from)
top, err := p.syncer.SyncInterval(ctx, peer, bin, from, math.MaxUint64)
if err != nil {
p.logger.Debugf("liveSyncWorker exit on sync error. peer %s bin %d from %d err %v", peer, bin, from, err)
......@@ -389,7 +384,6 @@ func (p *Puller) liveSyncWorker(ctx context.Context, peer swarm.Address, bin uin
if top == 0 {
return //TODO need to deal with this somehow. not right
}
p.logger.Tracef("liveSyncWorker peer %s synced bin %d from %d to %d", peer, bin, from, top)
err = p.addPeerInterval(peer, bin, from, top)
if err != nil {
p.logger.Debugf("liveSyncWorker exit on add peer interval. peer %s bin %d from %d err %v", peer, bin, from, err)
......
......@@ -189,7 +189,6 @@ func (s *Syncer) handler(ctx context.Context, p p2p.Peer, stream p2p.Stream) err
if err := r.ReadMsgWithContext(ctx, &rn); err != nil {
return fmt.Errorf("read get range: %w", err)
}
s.logger.Debugf("got range peer %s bin %d from %d to %d", p.Address.String(), rn.Bin, rn.From, rn.To)
// make an offer to the upstream peer in return for the requested range
offer, addrs, err := s.makeOffer(ctx, rn)
......@@ -245,7 +244,6 @@ func (s *Syncer) setChunks(ctx context.Context, addrs ...swarm.Address) error {
// makeOffer tries to assemble an offer for a given requested interval.
func (s *Syncer) makeOffer(ctx context.Context, rn pb.GetRange) (o *pb.Offer, addrs []swarm.Address, err error) {
s.logger.Tracef("syncer make offer for bin %d from %d to %d maxpage %d", rn.Bin, rn.From, rn.To, maxPage)
chs, top, err := s.storage.IntervalChunks(ctx, uint8(rn.Bin), rn.From, rn.To, maxPage)
if err != nil {
return o, nil, err
......@@ -279,7 +277,6 @@ func (s *Syncer) processWant(ctx context.Context, o *pb.Offer, w *pb.Want) ([]sw
}
func (s *Syncer) GetCursors(ctx context.Context, peer swarm.Address) ([]uint64, error) {
s.logger.Debugf("syncer get cursors from peer %s", peer)
stream, err := s.streamer.NewStream(ctx, peer, nil, protocolName, protocolVersion, cursorStreamName)
if err != nil {
return nil, fmt.Errorf("new stream: %w", err)
......@@ -297,8 +294,6 @@ func (s *Syncer) GetCursors(ctx context.Context, peer swarm.Address) ([]uint64,
return nil, fmt.Errorf("read ack: %w", err)
}
s.logger.Debugf("syncer peer %s cursors %s", peer, ack.Cursors)
return ack.Cursors, nil
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment