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

Close leaked response bodies #43

Merged
merged 3 commits into from
Dec 13, 2024
Merged

Close leaked response bodies #43

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b00cfd
Close leaked response bodies
andrewstucki Dec 13, 2024
1a8b7b2
switch from sync.Once to a full mutex
andrewstucki Dec 13, 2024
6f20927
Add leak check test
andrewstucki Dec 13, 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: 14 additions & 1 deletion rpadmin/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,8 @@ func (a *AdminAPI) sendAll(rootCtx context.Context, method, path string, body, i
}
}
}

successfulResponseIndex int
)

for i, url := range a.urlsWithPath(path) {
Expand All @@ -536,7 +538,14 @@ func (a *AdminAPI) sendAll(rootCtx context.Context, method, path string, body, i
// Only one request should be successful, but for
// paranoia, we guard keeping the first successful
// response.
once.Do(func() { resURL, res = myURL, myRes })
once.Do(func() { resURL, res, successfulResponseIndex = myURL, myRes, except })

if except != successfulResponseIndex {
// close the response body for my response since it won't be read
// in the unmarshaling code
myRes.Body.Close()
}

return nil
})
}
Expand Down Expand Up @@ -650,6 +659,10 @@ func (a *AdminAPI) sendAndReceive(
}

if res.StatusCode/100 != 2 {
// we read the body just below, so this response is now
// junked and we need to close it.
defer res.Body.Close()

resBody, err := io.ReadAll(res.Body)
status := http.StatusText(res.StatusCode)
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions rpadmin/api_debug.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ func (a *AdminAPI) DeleteDebugBundleFile(ctx context.Context, filename string) e
}

// DownloadDebugBundleFile gets the specific debug bundle file on the specified broker node.
// The caller must call close on the response returned as it does not yet have its body read.
func (a *AdminAPI) DownloadDebugBundleFile(ctx context.Context, filename string) (*http.Response, error) {
if len(a.urls) != 1 {
return nil, fmt.Errorf("unable to issue a single-admin-endpoint request to %d admin endpoints", len(a.urls))
Expand Down
Loading