From a02527b6133d37c8963bc135f22114d79c8b99d8 Mon Sep 17 00:00:00 2001 From: LexLuthr Date: Mon, 20 May 2024 12:15:45 +0530 Subject: [PATCH 1/2] close stream if no data --- datatransfer/network/libp2p_impl.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/datatransfer/network/libp2p_impl.go b/datatransfer/network/libp2p_impl.go index 1db400993..df31a9ff8 100644 --- a/datatransfer/network/libp2p_impl.go +++ b/datatransfer/network/libp2p_impl.go @@ -242,6 +242,7 @@ func (dtnet *libp2pDataTransferNetwork) handleNewStream(s network.Stream) { for { var received datatransfer.Message var err error + _ = s.SetReadDeadline(time.Now().Add(dtnet.sendMessageTimeout)) switch s.Protocol() { case datatransfer.ProtocolDataTransfer1_2: received, err = message.FromNet(s) @@ -253,9 +254,10 @@ func (dtnet *libp2pDataTransferNetwork) handleNewStream(s network.Stream) { go dtnet.receiver.ReceiveError(err) log.Debugf("net handleNewStream from %s error: %s", p, err) } + _ = s.SetReadDeadline(time.Time{}) return } - + _ = s.SetReadDeadline(time.Time{}) ctx := context.Background() log.Debugf("net handleNewStream from %s", p) From f6d62feb445363d46227cb28fa5f3d12933b0f22 Mon Sep 17 00:00:00 2001 From: LexLuthr Date: Mon, 20 May 2024 12:34:58 +0530 Subject: [PATCH 2/2] bump boost-graphsync --- go.mod | 2 +- go.sum | 4 ++-- go.work.sum | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 37c74bffb..14ce16a10 100644 --- a/go.mod +++ b/go.mod @@ -305,7 +305,7 @@ require ( ) require ( - github.com/filecoin-project/boost-graphsync v0.13.10 + github.com/filecoin-project/boost-graphsync v0.13.11 github.com/filecoin-project/boost/extern/boostd-data v0.0.0-20231124125934-3233c510357f github.com/filecoin-project/go-data-segment v0.0.1 github.com/filecoin-project/lotus v1.26.3 diff --git a/go.sum b/go.sum index 1ff0b95e8..c8711c25e 100644 --- a/go.sum +++ b/go.sum @@ -316,8 +316,8 @@ github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/filecoin-project/boost-graphsync v0.13.10 h1:L6qxpyognlcH73+vEPBXR8pbSMijXSV2CuV/sz0QDpA= -github.com/filecoin-project/boost-graphsync v0.13.10/go.mod h1:bc2M5ZLZJtXHl8kjnqtn4L1MsdEqpJErDaIeY0bJ9wk= +github.com/filecoin-project/boost-graphsync v0.13.11 h1:quhAvlz+26D1xLH5v5XfWFfuxsZEcwbpbZxmF5ZNJzw= +github.com/filecoin-project/boost-graphsync v0.13.11/go.mod h1:bc2M5ZLZJtXHl8kjnqtn4L1MsdEqpJErDaIeY0bJ9wk= github.com/filecoin-project/boost/extern/boostd-data v0.0.0-20231124125934-3233c510357f h1:8dd0yAadyeOL5Qd42XhEwD60UKvIFkY2MLhef/IaeOk= github.com/filecoin-project/boost/extern/boostd-data v0.0.0-20231124125934-3233c510357f/go.mod h1:MyzvfYWAH0OAyf95TLUWYq3cO3vm/TVzDS57GKQi47o= github.com/filecoin-project/dagstore v0.7.0 h1:IS0R+69za8dguYWeqz/MI+nb7ONpk03tAkxPCBXEKm0= diff --git a/go.work.sum b/go.work.sum index a48a90687..eaf6eb359 100644 --- a/go.work.sum +++ b/go.work.sum @@ -1371,6 +1371,7 @@ github.com/fatih/structs v0.0.0-20180123065059-ebf56d35bba7/go.mod h1:9NiDSp5zOc github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/filecoin-project/boost-graphsync v0.13.11/go.mod h1:bc2M5ZLZJtXHl8kjnqtn4L1MsdEqpJErDaIeY0bJ9wk= github.com/filecoin-project/boost/extern/boostd-data v0.0.0-20231009154452-ca8daa2870f3/go.mod h1:vHUM62fb82DpsBSXptQjpvcysjoV2Guc1MVJiIYccfQ= github.com/filecoin-project/filecoin-ffi v0.30.4-0.20220519234331-bfd1f5f9fe38/go.mod h1:GM5pXRYvQM7wyH6V2WtPnJ2k1jt+qotRkWLxBSRCOuE= github.com/filecoin-project/go-dagaggregator-unixfs v0.3.0 h1:UXLtBUnPa61LkNa2GqhP+aJ53bOnHP/dzg6/wk2rnsA=