Simplify TranslogWriter#closeWithTragicEvent #29412
Merged
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
This commit simplifies the exception handling in TranslogWriter#closeWithTragicEvent. When invoking this method, the inner close method could throw an exception which we always catch and suppress into the exception that led us to tragically close. This commit moves that repeated logic into closeWithTragicException and now callers simply need to catch, invoke closeWithTragicException, and rethrow.
jasontedor
added
>non-issue
review
v7.0.0
v6.3.0
:Distributed Indexing/Engine
|
Pinging @elastic/es-distributed |
ywelsch
reviewed
Apr 6, 2018
| try { | ||
| close(); | ||
| } catch (final IOException | RuntimeException e) { | ||
| ex.addSuppressed(e); |
There was a problem hiding this comment.
why not just catch (final Exception e) { here?
There was a problem hiding this comment.
I want a compile-time error if a new checked exception crops here so that it's deliberately thought through.
I have done that. |
|
@ywelsch I responded to your comments; thanks for taking a look. |
s1monw
approved these changes
Apr 9, 2018
jasontedor
added a commit
that referenced
this pull request
Apr 10, 2018
This commit simplifies the exception handling in TranslogWriter#closeWithTragicEvent. When invoking this method, the inner close method could throw an exception which we always catch and suppress into the exception that led us to tragically close. This commit moves that repeated logic into closeWithTragicException and now callers simply need to catch, invoke closeWithTragicException, and rethrow.
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.
This commit simplifies the exception handling in TranslogWriter#closeWithTragicEvent. When invoking this method, the inner close method could throw an exception which we always catch and suppress into the exception that led us to tragically close. This commit moves that repeated logic into closeWithTragicException and now callers simply need to catch, invoke closeWithTragicException, and rethrow. Note also that a catch block that was only catching
IOExceptionhas been generalized to catch any exception for consistency with the remaining invocations of TranslogWriter#closeWithTragicEvent.Relates #29401