TSM: TSMReader.Close blocks until reads complete #9792
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
ghost
added
the
jacobmarble
force-pushed
the
jm-rm-tsm-files
branch
2 times, most recently
from
255f2aa
to
98cfb30
Compare
|
Tests are timing out. That's probably important in this change, so I'm digging in now. |
jacobmarble
force-pushed
the
jm-rm-tsm-files
branch
from
98cfb30
to
0529429
Compare
|
This should fix tests. Just needed to close iterators and cursors. |
benbjohnson
approved these changes
Apr 30, 2018
e-dard
approved these changes
Apr 30, 2018
|
@e-dard Thanks! |
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.
Fixes #9786
TSMReader.Closereturns an error when queries are referencing the TSM file, butFileStore.Closeignores the error.In this change,
FileStore.Closechecks the error, andTSMReader.Closeblocks, rather than returning the error. This makes it clear to the caller ofFileStore.Close(drop shard Xfor example) that the file is safely closed, rather than requiring the caller to retry up to thousands of times when the query load is constantly high.After this change, TSM files are always closed when
drop shard Xreturns, and writing to a shard that is currently being deleted returns a partial error.