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

Rethrow exception during recovery finalization even if source if not broken 

Today we miss to throw / rethrow an recovery exception if it happens during
the finalization of phase 1 if the source files are not affected. Even worse
this can cause some dataloss if the reason for this exception is a failure of
deleting a corruption marker or similar pre-existing corruptions since we continue
with the recovery and mark the target shared as started which will in-turn open
an engine with an empty index.
This commit is contained in:
Simon Willnauer 2015-08-05 12:28:47 +02:00
parent 065275443d
commit abf763c1c5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java
View File

@ -435,6 +435,7 @@ public class RecoverySourceHandler {
exception.addSuppressed(remoteException); exception.addSuppressed(remoteException);
logger.warn("{} Remote file corruption during finalization on node {}, recovering {}. local checksum OK", logger.warn("{} Remote file corruption during finalization on node {}, recovering {}. local checksum OK",
corruptIndexException, shard.shardId(), request.targetNode()); corruptIndexException, shard.shardId(), request.targetNode());
throw exception;
} else { } else {
throw remoteException; throw remoteException;
} }

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

@ -406,9 +406,13 @@ public class RecoveryTarget extends AbstractComponent {
logger.debug("Failed to clean lucene index", e); logger.debug("Failed to clean lucene index", e);
ex.addSuppressed(e); ex.addSuppressed(e);
} }
throw new RecoveryFailedException(recoveryStatus.state(), "failed to clean after recovery", ex); RecoveryFailedException rfe = new RecoveryFailedException(recoveryStatus.state(), "failed to clean after recovery", ex);
recoveryStatus.fail(rfe, true);
throw rfe;
} catch (Exception ex) { } catch (Exception ex) {
throw new RecoveryFailedException(recoveryStatus.state(), "failed to clean after recovery", ex); RecoveryFailedException rfe = new RecoveryFailedException(recoveryStatus.state(), "failed to clean after recovery", ex);
recoveryStatus.fail(rfe, true);
throw rfe;
} }
channel.sendResponse(TransportResponse.Empty.INSTANCE); channel.sendResponse(TransportResponse.Empty.INSTANCE);
} }