Do not cancel context on Connection.Close #40769
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit removes a call to conn.cancelReqs() that causes the Connection to be unusable after Close() is called, leading to the bug described by elastic#40705.
belimawr
added
Team:Elastic-Agent-Data-Plane
|
Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane) |
botelastic
bot
added
needs_team
cmacknz
approved these changes
Sep 11, 2024
mauri870
approved these changes
Sep 11, 2024
mauri870
reviewed
Sep 11, 2024
| @@ -326,7 +326,6 @@ func (conn *Connection) Ping() (ESPingData, error) { | |||
| // Close closes a connection. | |||
| func (conn *Connection) Close() error { | |||
| conn.HTTP.CloseIdleConnections() | |||
| conn.cancelReqs() | |||
There was a problem hiding this comment.
Looking at the diff from #40572, which introduced the issue, it seems that cancelReqs is only called here, and you ended up removing it as the fix. Does that mean we should just remove the other references to it as well?
There was a problem hiding this comment.
That's a quick fix to fix our released branches while we work on the actual fix, hence I only removed the line causing the issue and left the rest of the feature. Soon I'll make a PR with tests and a proper fix.
|
I think the CI failure is unrelated, I'm rerunning the tests. I also enabled auto-merge. |
6 tasks
6 tasks
belimawr
added a commit
that referenced
this pull request
Sep 12, 2024
This commit removes a call to conn.cancelReqs() that causes the Connection to be unusable after Close() is called, leading to the bug described by #40705. (cherry picked from commit b0e4f85) Co-authored-by: Tiago Queiroz <[email protected]>
belimawr
added a commit
that referenced
this pull request
Sep 12, 2024
This commit removes a call to conn.cancelReqs() that causes the Connection to be unusable after Close() is called, leading to the bug described by #40705. (cherry picked from commit b0e4f85) Co-authored-by: Tiago Queiroz <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed commit message
This commit removes a call to conn.cancelReqs() that causes the Connection to be unusable after Close() is called, leading to the bug described by #40705.
Checklist
CHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.Disruptive User Impact
Author's Checklist
How to test this PR locally
Related issues
Use cases
Screenshots
Logs