cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

clear deadline in server

Browse Source
This commit is contained in:
Lucas Molas 2020-08-05 19:40:00 -03:00
parent 7982ab52a7
commit 65512193cc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chain/blocksync/client.go
View File

@ -378,14 +378,12 @@ func (client *BlockSync) sendRequestToPeer(
_ = stream.SetWriteDeadline(time.Now().Add(WRITE_REQ_DEADLINE)) _ = stream.SetWriteDeadline(time.Now().Add(WRITE_REQ_DEADLINE))
if err := cborutil.WriteCborRPC(stream, req); err != nil { if err := cborutil.WriteCborRPC(stream, req); err != nil {
_ = stream.SetWriteDeadline(time.Time{}) _ = stream.SetWriteDeadline(time.Time{})
// FIXME: What's the point of setting a blank deadline that won't time out?
// Is this our way of clearing the old one?
client.peerTracker.logFailure(peer, build.Clock.Since(connectionStart)) client.peerTracker.logFailure(peer, build.Clock.Since(connectionStart))
// FIXME: Should we also remove peer here? // FIXME: Should we also remove peer here?
return nil, err return nil, err
} }
// FIXME: Same, why are we doing this again here? _ = stream.SetWriteDeadline(time.Time{}) // clear deadline // FIXME: Needs
_ = stream.SetWriteDeadline(time.Time{}) // its own API (https://github.com/libp2p/go-libp2p-core/issues/162).
// Read response. // Read response.
var res Response var res Response

2
chain/blocksync/server.go
View File

@ -71,10 +71,12 @@ func (server *BlockSyncService) HandleStream(stream inet.Stream) {
_ = stream.SetDeadline(time.Now().Add(WRITE_RES_DEADLINE)) _ = stream.SetDeadline(time.Now().Add(WRITE_RES_DEADLINE))
if err := cborutil.WriteCborRPC(stream, resp); err != nil { if err := cborutil.WriteCborRPC(stream, resp); err != nil {
_ = stream.SetDeadline(time.Time{})
log.Warnw("failed to write back response for handle stream", log.Warnw("failed to write back response for handle stream",
"err", err, "peer", stream.Conn().RemotePeer()) "err", err, "peer", stream.Conn().RemotePeer())
return return
} }
_ = stream.SetDeadline(time.Time{})
} }
// Validate and service the request. We return either a protocol // Validate and service the request. We return either a protocol