rpc: avoid closing already closed DRPC connection #154851
Open
+7
−2
Conversation
This file contains hidden or 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
Previously, closing an already closed DRPC connection would lead to a panic. `panic: close of closed channel` This patch makes the closing of an already closed connection to be a no-op. Epic: none Release note: None
![blathers[crl]](https://avatars.githubusercontent.com/in/59700?s=40&u=95b789b1d594ac6b74f377aa7555d8d98d63240d&v=4){kind=avatar}
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
|
This change is |
shubhamdhama
approved these changes
Oct 6, 2025
stevendanna
reviewed
Oct 6, 2025
Comment on lines
+141
to
+147
| select { | ||
| case <-c.Conn.Closed(): | ||
| return nil // already closed | ||
| default: | ||
| _ = c.Conn.Close() | ||
| return c.pool.Close() | ||
| } |
There was a problem hiding this comment.
Does Close() need to be concurrency safe?
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.
Previously, closing an already closed DRPC connection would lead to a panic.
panic: close of closed channelThis patch makes the closing of an already closed connection to be a no-op.
Epic: none
Release note: None