status-im
/
go-libp2p-pubsub
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

only call fragmentRPC if we're over the size limit

This commit is contained in:
Yusef Napora 2020-05-06 10:25:14 -04:00 committed by vyzo
parent 568fa5a244
commit 21a4f8c0c8
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gossipsub.go
View File

@ -899,16 +899,31 @@ func (gs *GossipSubRouter) sendRPC(p peer.ID, out *RPC) {
return
}
// fragment into multiple RPCs if necessary
outRPCs, err := fragmentRPC(out, gs.p.maxMessageSize)
if err != nil {
log.Warnf("unable to fragment message to peer %s: %s", p, err)
gs.tracer.DropRPC(out, p)
dropRPC := func(rpc *RPC, template string, args ...interface{}) {
log.Warnf(template, args...)
gs.tracer.DropRPC(rpc, p)
// push control messages that need to be retried
ctl := out.GetControl()
ctl := rpc.GetControl()
if ctl != nil {
gs.pushControl(p, ctl)
}
}
// If we're below the max message size, go ahead and send
if out.Size() < gs.p.maxMessageSize {
select {
case mch <- out:
gs.tracer.SendRPC(out, p)
default:
dropRPC(out, "dropping message to peer %s: queue full", p)
}
return
}
// If we're too big, fragment into multiple RPCs and send each sequentially
outRPCs, err := fragmentRPC(out, gs.p.maxMessageSize)
if err != nil {
dropRPC(out, "unable to fragment message to peer %s: %s", p, err)
return
}
@ -917,13 +932,7 @@ func (gs *GossipSubRouter) sendRPC(p peer.ID, out *RPC) {
case mch <- rpc:
gs.tracer.SendRPC(rpc, p)
default:
log.Infof("dropping message to peer %s: queue full", p)
gs.tracer.DropRPC(rpc, p)
// push control messages that need to be retried
ctl := rpc.GetControl()
if ctl != nil {
gs.pushControl(p, ctl)
}
dropRPC(rpc, "dropping message to peer %s: queue full", p)
}
}
}