Don't rethrow already handled merge exceptions #10083
Closed
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.
ES already has a custom merge exception handler that 1) logs the exception and 2) fails the engine ... and then it calls super, which throws an unhandled exception, which I think is redundant. The JVM catches that and logs it again (to stderr), and this causes test failures like http://build-us-00.elastic.co/job/es_core_1x_centos/3701
I think we should remove the super call?