Skip to content
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

Jump to bottom

lightning: every HTTP retry should use its own request (#47959) #47969

Merged
merged 2 commits into from
Oct 26, 2023
Merged

lightning: every HTTP retry should use its own request (#47959) #47969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdbf7fb
lightning: every HTTP retry should use its own request
lance6716 Oct 25, 2023
99b24ee
fix lint
lance6716 Oct 25, 2023
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
13 changes: 8 additions & 5 deletions br/pkg/pdutil/pd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,16 @@ func pdRequestWithCode(
return 0, nil, errors.Trace(err)
}
reqURL := fmt.Sprintf("%s/%s", u, prefix)
req, err := http.NewRequestWithContext(ctx, method, reqURL, body)
if err != nil {
return 0, nil, errors.Trace(err)
}
var resp *http.Response
var (
req *http.Request
resp *http.Response
)
count := 0
for {
req, err = http.NewRequestWithContext(ctx, method, reqURL, body)
if err != nil {
return 0, nil, errors.Trace(err)
}
resp, err = cli.Do(req) //nolint:bodyclose
count++
failpoint.Inject("InjectClosed", func(v failpoint.Value) {
Expand Down
11 changes: 10 additions & 1 deletion br/pkg/pdutil/pd_serial_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package pdutil

import (
"bytes"
"context"
"encoding/hex"
"encoding/json"
Expand Down Expand Up @@ -186,8 +187,16 @@ func TestPDRequestRetry(t *testing.T) {
w.WriteHeader(http.StatusOK)
}))
cli := http.DefaultClient
cli.Transport = http.DefaultTransport.(*http.Transport).Clone()
// although the real code doesn't disable keep alive, we need to disable it
// in test to avoid the connection being reused and #47930 can't appear. The
// real code will only meet #47930 when go's internal http client just dropped
// all idle connections.
cli.Transport.(*http.Transport).DisableKeepAlives = true

taddr := ts.URL
_, reqErr := pdRequest(ctx, taddr, "", cli, http.MethodGet, nil)
body := bytes.NewBuffer([]byte("test"))
_, reqErr := pdRequest(ctx, taddr, "", cli, http.MethodPost, body)
require.NoError(t, reqErr)
ts.Close()
count = 0
Expand Down
Loading