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

rollback commit, allocation should only happen when index is not recovered

This commit is contained in:
kimchy 2010-10-17 19:43:30 +02:00
parent 9a09261383
commit 69ecf8b66b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/LocalGatewayNodeAllocation.java
View File

@ -154,8 +154,11 @@ public class LocalGatewayNodeAllocation extends NodeAllocation {
RoutingNodes routingNodes = allocation.routingNodes(); RoutingNodes routingNodes = allocation.routingNodes();
for (IndexRoutingTable indexRoutingTable : routingNodes.routingTable()) { for (IndexRoutingTable indexRoutingTable : routingNodes.routingTable()) {
// TODO we need to also handle a case where all shards per replication group are unassigned, in that case, we ignore until we // only do the allocation if there is a local "INDEX NOT RECOVERED" block
// manage to find a place to allocate them... if (!routingNodes.blocks().hasIndexBlock(indexRoutingTable.index(), LocalGateway.INDEX_NOT_RECOVERED_BLOCK)) {
continue;
}
if (indexRoutingTable.allPrimaryShardsUnassigned()) { if (indexRoutingTable.allPrimaryShardsUnassigned()) {
// all primary are unassigned for the index, see if we can allocate it on existing nodes, if not, don't assign // all primary are unassigned for the index, see if we can allocate it on existing nodes, if not, don't assign
Set<String> nodesIds = Sets.newHashSet(); Set<String> nodesIds = Sets.newHashSet();
@ -245,7 +248,6 @@ public class LocalGatewayNodeAllocation extends NodeAllocation {
return changed; return changed;
} }
// go ahead and see if we can optimize replica allocation to an existing node...
Iterator<MutableShardRouting> unassignedIterator = routingNodes.unassigned().iterator(); Iterator<MutableShardRouting> unassignedIterator = routingNodes.unassigned().iterator();
while (unassignedIterator.hasNext()) { while (unassignedIterator.hasNext()) {
MutableShardRouting shard = unassignedIterator.next(); MutableShardRouting shard = unassignedIterator.next();