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

[RECOVERY] Throw IndexShardClosedException if shard is closed 

Today we throw a generic ElasticsearchException when a recovery is cancled. This
causes verbose logging and send shard failures and additional unnecessary cluster state
events. We can just throw IndexShardClosedException which prevents the send shard failures
This commit is contained in:
Simon Willnauer 2014-11-25 13:05:00 +01:00
parent afba977e80
commit 0a4e041ee5
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java
View File

@ -30,4 +30,8 @@ public class IndexShardClosedException extends IllegalIndexShardStateException {
public IndexShardClosedException(ShardId shardId, Throwable t) {
super(shardId, IndexShardState.CLOSED, "Closed", t);
}
public IndexShardClosedException(ShardId shardId, String message) {
super(shardId, IndexShardState.CLOSED, message);
}
}

18
src/main/java/org/elasticsearch/indices/recovery/ShardRecoveryHandler.java
View File

@ -89,7 +89,16 @@ public final class ShardRecoveryHandler implements Engine.RecoveryHandler {
private final MappingUpdatedAction mappingUpdatedAction;
private final RecoveryResponse response;
private final CancelableThreads cancelableThreads = new CancelableThreads();
private final CancelableThreads cancelableThreads = new CancelableThreads() {
@Override
protected void fail(String reason) {
if (shard.state() == IndexShardState.CLOSED) { // check if the shard got closed on us
throw new IndexShardClosedException(shard.shardId(), "shard is closed and recovery was canceled reason [" + reason + "]");
} else {
throw new ElasticsearchException("recovery was canceled reason [" + reason + "]");
}
}
};
public ShardRecoveryHandler(final InternalIndexShard shard, final StartRecoveryRequest request, final RecoverySettings recoverySettings,
final TransportService transportService, final TimeValue internalActionTimeout,
@ -625,7 +634,7 @@ public final class ShardRecoveryHandler implements Engine.RecoveryHandler {
cancelableThreads.cancel(reason);
}
private static final class CancelableThreads {
private static abstract class CancelableThreads {
private final Set<Thread> threads = new HashSet<>();
private boolean canceled = false;
private String reason;
@ -637,9 +646,12 @@ public final class ShardRecoveryHandler implements Engine.RecoveryHandler {
public synchronized void failIfCanceled() {
if (isCanceled()) {
throw new ElasticsearchException("recovery was canceled reason [" + reason + "]");
fail(reason);
}
}
protected abstract void fail(String reason);
private synchronized void add() {
failIfCanceled();
threads.add(Thread.currentThread());