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

Require that relocation source is marked as relocating before starting recovery to relocation target

This commit is contained in:
Yannick Welsch 2016-02-08 13:14:14 +01:00
parent cbeae225b9
commit 7ea4f7400b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,14 @@ public class RecoverySource extends AbstractComponent implements IndexEventListe
logger.debug("delaying recovery of {} as source node {} is unknown", request.shardId(), request.targetNode()); logger.debug("delaying recovery of {} as source node {} is unknown", request.shardId(), request.targetNode());
throw new DelayRecoveryException("source node does not have the node [" + request.targetNode() + "] in its state yet.."); throw new DelayRecoveryException("source node does not have the node [" + request.targetNode() + "] in its state yet..");
} }
ShardRouting routingEntry = shard.routingEntry();
if (request.recoveryType() == RecoveryState.Type.PRIMARY_RELOCATION &&
(routingEntry.relocating() == false || routingEntry.relocatingNodeId().equals(request.targetNode().getId()) == false)) {
logger.debug("delaying recovery of {} as source shard is not marked yet as relocating to {}", request.shardId(), request.targetNode());
throw new DelayRecoveryException("source shard is not marked yet as relocating to [" + request.targetNode() + "]");
}
ShardRouting targetShardRouting = null; ShardRouting targetShardRouting = null;
for (ShardRouting shardRouting : node) { for (ShardRouting shardRouting : node) {
if (shardRouting.shardId().equals(request.shardId())) { if (shardRouting.shardId().equals(request.shardId())) {