Skip to content

p2p: do not register closing peer #6086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
algorandskiy merged 3 commits into from
Jul 29, 2024
Merged

p2p: do not register closing peer #6086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b360ea
tests: use require.Errors instread of require.True
algorandskiy Jul 29, 2024
d7ce2bf
p2p net: do not register closing peers
algorandskiy Jul 29, 2024
3805362
Update network/p2pNetwork.go
algorandskiy Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions catchup/universalFetcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ func TestRequestBlockBytesErrors(t *testing.T) {
cancel()
_, _, _, err = fetcher.fetchBlock(ctx, next, up)
var wrfe errWsFetcherRequestFailed
require.True(t, errors.As(err, &wrfe), "unexpected err: %w", wrfe)
require.ErrorAs(t, err, &wrfe)
require.Equal(t, "context canceled", err.(errWsFetcherRequestFailed).cause)

ctx = context.Background()
Expand All @@ -213,14 +213,14 @@ func TestRequestBlockBytesErrors(t *testing.T) {
up = makeTestUnicastPeerWithResponseOverride(net, t, &responseOverride)

_, _, _, err = fetcher.fetchBlock(ctx, next, up)
require.True(t, errors.As(err, &wrfe))
require.ErrorAs(t, err, &wrfe)
require.Equal(t, "Cert data not found", err.(errWsFetcherRequestFailed).cause)

responseOverride = network.Response{Topics: network.Topics{network.MakeTopic(rpcs.CertDataKey, make([]byte, 0))}}
up = makeTestUnicastPeerWithResponseOverride(net, t, &responseOverride)

_, _, _, err = fetcher.fetchBlock(ctx, next, up)
require.True(t, errors.As(err, &wrfe))
require.ErrorAs(t, err, &wrfe)
require.Equal(t, "Block data not found", err.(errWsFetcherRequestFailed).cause)
}

Expand All @@ -240,7 +240,6 @@ func (thh *TestHTTPHandler) ServeHTTP(response http.ResponseWriter, request *htt
bytes = make([]byte, fetcherMaxBlockBytes+1)
}
response.Write(bytes)
return
}

// TestGetBlockBytesHTTPErrors tests the errors reported from getblockBytes for http peer
Expand All @@ -264,25 +263,25 @@ func TestGetBlockBytesHTTPErrors(t *testing.T) {
ls.status = http.StatusBadRequest
_, _, _, err := fetcher.fetchBlock(context.Background(), 1, net.GetPeers()[0])
var hre errHTTPResponse
require.True(t, errors.As(err, &hre))
require.ErrorAs(t, err, &hre)
require.Equal(t, "Response body '\x00'", err.(errHTTPResponse).cause)

ls.exceedLimit = true
_, _, _, err = fetcher.fetchBlock(context.Background(), 1, net.GetPeers()[0])
require.True(t, errors.As(err, &hre))
require.ErrorAs(t, err, &hre)
require.Equal(t, "read limit exceeded", err.(errHTTPResponse).cause)

ls.status = http.StatusOK
ls.content = append(ls.content, "undefined")
_, _, _, err = fetcher.fetchBlock(context.Background(), 1, net.GetPeers()[0])
var cte errHTTPResponseContentType
require.True(t, errors.As(err, &cte))
require.ErrorAs(t, err, &cte)
require.Equal(t, "undefined", err.(errHTTPResponseContentType).contentType)

ls.status = http.StatusOK
ls.content = append(ls.content, "undefined2")
_, _, _, err = fetcher.fetchBlock(context.Background(), 1, net.GetPeers()[0])
require.True(t, errors.As(err, &cte))
require.ErrorAs(t, err, &cte)
require.Equal(t, 2, err.(errHTTPResponseContentType).contentTypeCount)
}

Expand Down
6 changes: 6 additions & 0 deletions network/p2pNetwork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,12 @@ func (n *P2PNetwork) wsStreamHandler(ctx context.Context, p2pPeer peer.ID, strea

wsp.init(n.config, outgoingMessagesBufferSize)
n.wsPeersLock.Lock()
if wsp.didSignalClose.Load() == 1 {
networkPeerAlreadyClosed.Inc(nil)
n.log.Debugf("peer closing %s", addr)
n.wsPeersLock.Unlock()
return
Comment thread
algorandskiy marked this conversation as resolved.
}
n.wsPeers[p2pPeer] = wsp
n.wsPeersToIDs[wsp] = p2pPeer
n.wsPeersLock.Unlock()
Expand Down