fix: Do not close connection twice in DigestWithOptions #21860
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
tsm1.DigestWithOptions closes its network connection twice. This may cause broken pipe errors on concurrent invocations of the same procedure, by closing a reused i/o descriptor. This fix also captures errors from TSM file closures, which were previously ignored.
lesam
reviewed
Jul 16, 2021
| @@ -22,7 +22,7 @@ type DigestOptions struct { | |||
|
|
|||
| // DigestWithOptions writes a digest of dir to w using options to filter by | |||
| // time and key range. | |||
| func DigestWithOptions(dir string, files []string, opts DigestOptions, w io.WriteCloser) error { | |||
| func DigestWithOptions(dir string, files []string, opts DigestOptions, w io.WriteCloser) (err error) { | |||
There was a problem hiding this comment.
Do we use digesting for something in 2.x?
There was a problem hiding this comment.
Hmmm it looks like no (the call chain traces to ShardDigest, which isn't called anywhere). Think this should be closed? Or merged to keep things as in-sync as possible while it's easy?
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.
Backports #21662