forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-19 13:21:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rpc: avoid unnecessary RST_STREAM, PING frames sent by client #33122 (#1788)

Browse source
This commit is contained in:
wit liu 2025-11-24 13:29:19 +08:00 committed by GitHub
parent ea179d287c
commit d5226ba29f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
rpc/http.go
View file

@ -168,13 +168,21 @@ func newClientTransportHTTP(endpoint string, cfg *clientConfig) reconnectFunc {
}
}
// cleanlyCloseBody avoids sending unnecessary RST_STREAM and PING frames by
// ensuring the whole body is read before being closed.
// See https://blog.cloudflare.com/go-and-enhance-your-calm/#reading-bodies-in-go-can-be-unintuitive
func cleanlyCloseBody(body io.ReadCloser) error {
io.Copy(io.Discard, body)
return body.Close()
}
func (c *Client) sendHTTP(ctx context.Context, op *requestOp, msg interface{}) error {
hc := c.writeConn.(*httpConn)
respBody, err := hc.doRequest(ctx, msg)
if err != nil {
return err
}
defer respBody.Close()
defer cleanlyCloseBody(respBody)
var resp jsonrpcMessage
batch := [1]*jsonrpcMessage{&resp}
@ -191,7 +199,7 @@ func (c *Client) sendBatchHTTP(ctx context.Context, op *requestOp, msgs []*jsonr
if err != nil {
return err
}
defer respBody.Close()
defer cleanlyCloseBody(respBody)
var respmsgs []*jsonrpcMessage
if err := json.NewDecoder(respBody).Decode(&respmsgs); err != nil {
@ -235,7 +243,7 @@ func (hc *httpConn) doRequest(ctx context.Context, msg interface{}) (io.ReadClos
if _, err := buf.ReadFrom(resp.Body); err == nil {
body = buf.Bytes()
}
resp.Body.Close()
cleanlyCloseBody(resp.Body)
return nil, HTTPError{
Status: resp.Status,
StatusCode: resp.StatusCode,

2
rpc/http_test.go
View file

@ -106,7 +106,7 @@ func confirmHTTPRequestYieldsStatusCode(t *testing.T, method, contentType, body
if err != nil {
t.Fatalf("request failed: %v", err)
}
resp.Body.Close()
cleanlyCloseBody(resp.Body)
confirmStatusCode(t, resp.StatusCode, expectedStatusCode)
}