Make unwrapCorrupt Check Suppressed Ex. #41889
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
original-brownbear
added
>non-issue
:Distributed/Store
|
Pinging @elastic/es-distributed |
|
Jenkins run elasticsearch-ci/1 |
server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java
Outdated
Show resolved
Hide resolved
* As discussed in elastic#24800 we want to check for suppressed corruption indicating exceptions here as well to more reliably categorize corruption related exceptions * Closes elastic#24800, 41201
|
Jenkins run elasticsearch-ci/1 |
ywelsch
suggested changes
May 8, 2019
| IOException corruptionException = | ||
| (IOException) unwrap(t, CorruptIndexException.class, IndexFormatTooOldException.class, IndexFormatTooNewException.class); | ||
| if (corruptionException == null && t != null) { | ||
| for (Throwable suppressed : t.getSuppressed()) { |
There was a problem hiding this comment.
do we need to check suppressed exceptions of Throwable.getCause etc?
There was a problem hiding this comment.
Right! I guess we should will add that together with tests in a sec :)
|
@ywelsch done, added more tests and made it follow the suppressions on causes as well :) |
jpountz
approved these changes
May 10, 2019
| @@ -175,10 +175,26 @@ public static String formatStackTrace(final StackTraceElement[] stackTrace) { | |||
| return first; | |||
| } | |||
|
|
|||
| private static final List<Class<? extends IOException>> CORRUPTION_EXCEPTIONS = | |||
| List.of(CorruptIndexException.class, IndexFormatTooOldException.class, IndexFormatTooNewException.class); | |||
|
|
|||
| public static IOException unwrapCorruption(Throwable t) { | |||
There was a problem hiding this comment.
can you add javadocs to mention that this checks both causes and suppressed exceptions?
There was a problem hiding this comment.
and maybe javadocs to unwrap too to make it clear it doesn't look at suppressed exceptions?
There was a problem hiding this comment.
Sounds good, added javadoc to both :)
jpountz
approved these changes
May 10, 2019
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
May 22, 2019
* master: (82 commits) Fix off-by-one error in an index shard test Cleanup Redundant BlobStoreFormat Class (elastic#42195) remove backcompat handling of 6.2.x versions (elastic#42044) Mute testDelayedOperationsBeforeAndAfterRelocated Execute actions under permit in primary mode only (elastic#42241) Mute another transforms_stats yaml test Deprecate support for chained multi-fields. (elastic#41926) Mute transforms_stats yaml test Make unwrapCorrupt Check Suppressed Ex. (elastic#41889) Remove Dead Code from Azure Repo Plugin (elastic#42178) Reorganize Painless doc structure (elastic#42303) Avoid unnecessary persistence of retention leases (elastic#42299) [ML][TEST] Fix limits in AutodetectMemoryLimitIT (elastic#42279) [ML Data Frame] Persist and restore checkpoint and position (elastic#41942) mute failing filerealm hash caching tests (elastic#42304) Safer Wait for Snapshot Success in ClusterPrivilegeTests (elastic#40943) Remove 7.0.2 (elastic#42282) Revert "Remove 7.0.2 (elastic#42282)" [DOCS] Copied note on slicing support to Slicing section. Closes 26114 (elastic#40426) Remove 7.0.2 (elastic#42282) ...
gurkankaymak
pushed a commit
to gurkankaymak/elasticsearch
that referenced
this pull request
May 27, 2019
* Make unwrapCorrupt Check Suppressed Ex. * As discussed in elastic#24800 we want to check for suppressed corruption indicating exceptions here as well to more reliably categorize corruption related exceptions * Closes elastic#24800, 41201
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
May 28, 2019
* Make unwrapCorrupt Check Suppressed Ex. * As discussed in elastic#24800 we want to check for suppressed corruption indicating exceptions here as well to more reliably categorize corruption related exceptions * Closes elastic#24800, 41201
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Jun 3, 2019
* Make unwrapCorrupt Check Suppressed Ex. * As discussed in elastic#24800 we want to check for suppressed corruption indicating exceptions here as well to more reliably categorize corruption related exceptions * Closes elastic#24800, 41201
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Jun 3, 2019
* Make unwrapCorrupt Check Suppressed Ex. (elastic#41889) * As discussed in elastic#24800 we want to check for suppressed corruption indicating exceptions here as well to more reliably categorize corruption related exceptions * Closes elastic#24800, 41201
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Jun 3, 2019
* Make unwrapCorrupt Check Suppressed Ex. (elastic#41889) * As discussed in elastic#24800 we want to check for suppressed corruption indicating exceptions here as well to more reliably categorize corruption related exceptions * Closes elastic#24800, 41201
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.
indicating exceptions here as well to more reliably categorize
corruption related exceptions