honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11583 from bleskes/mapper_exception_unwrap 

Recovery: Fix MapperException detection during translog ops replay
This commit is contained in:
Boaz Leskes 2015-06-10 19:06:53 +02:00
parent 831cfa52d5 e9d275d3a9
commit 650950c7f4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java
View File

@ -306,7 +306,8 @@ public class RecoveryTarget extends AbstractComponent {
try { try {
recoveryStatus.indexShard().performBatchRecovery(request.operations()); recoveryStatus.indexShard().performBatchRecovery(request.operations());
} catch (TranslogRecoveryPerformer.BatchOperationException exception) { } catch (TranslogRecoveryPerformer.BatchOperationException exception) {
if (ExceptionsHelper.unwrapCause(exception) instanceof MapperException == false) { MapperException mapperException = (MapperException) ExceptionsHelper.unwrap(exception, MapperException.class);
if (mapperException == null) {
throw exception; throw exception;
} }
// in very rare cases a translog replay from primary is processed before a mapping update on this node // in very rare cases a translog replay from primary is processed before a mapping update on this node