chore: fix deadlock in influx_inspect dumptsi
#22661
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
serenibyss
force-pushed
the
ds-fix-dumptsi-deadlock
branch
from
b65d72b to
c9093c4
Compare
serenibyss
force-pushed
the
ds-fix-dumptsi-deadlock
branch
from
464299b to
318d580
Compare
lesam
previously approved these changes
Oct 19, 2021
lesam
reviewed
Oct 19, 2021
davidby-influx
requested changes
Oct 19, 2021
There was a problem hiding this comment.
We need to catch the unhandled errors. Close() can fail from things like flushing buffers.
@lesam had a nice little idiom for doing this; you can see it here:
This was referenced Oct 20, 2021
serenibyss
added a commit
that referenced
this pull request
Oct 20, 2021
3 tasks
chengshiwen
pushed a commit
to chengshiwen/influxdb
that referenced
this pull request
Aug 11, 2024
chengshiwen
pushed a commit
to chengshiwen/influxdb
that referenced
this pull request
Aug 27, 2024
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.
Closes #22658
This PR fixes the deadlock demonstrated in EAR 2636 by swapping the order of
fs.Close()andfs.Release(), which due to how Go'sdeferkeyword works,Close()was being called beforeRelease(), andClose()was callingSyncGroup.Wait(), causing the deadlock.Additionally, I improved some of the error logging for this command (most of which comes from the 2.x version of this command), and improved some of our synchronization object handling in various IndexFile and LogFile functions