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

do routing automatically also when routing table changed, don't wait for the scheduled one (it means a new index has created, shard started/failed)

This commit is contained in:
kimchy 2010-02-18 10:04:10 +02:00
parent f135a93b70
commit 30ff15e3fc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java
View File

@ -104,13 +104,16 @@ public class RoutingService extends AbstractComponent implements ClusterStateLis
if (scheduledRoutingTableFuture == null) {
scheduledRoutingTableFuture = threadPool.scheduleWithFixedDelay(new RoutingTableUpdater(), schedule);
}
if (event.nodesRemoved()) {
if (event.nodesRemoved() || event.routingTableChanged()) {
// if nodes were removed, we don't want to wait for the scheduled task
// since we want to get primary election as fast as possible
// also, if the routing table changed, it means that we have new indices, or shard have started
// or failed, we want to apply this as fast as possible
routingTableDirty = true;
threadPool.execute(new RoutingTableUpdater());
} else {
if (event.routingTableChanged() || event.nodesAdded()) {
if (event.nodesAdded()) {
routingTableDirty = true;
}
}
@ -134,13 +137,13 @@ public class RoutingService extends AbstractComponent implements ClusterStateLis
if (lifecycle.stopped()) {
return;
}
routingTableDirty = false;
clusterService.submitStateUpdateTask(CLUSTER_UPDATE_TASK_SOURCE, new ClusterStateUpdateTask() {
@Override public ClusterState execute(ClusterState currentState) {
RoutingTable newRoutingTable = shardsRoutingStrategy.reroute(currentState);
return newClusterStateBuilder().state(currentState).routingTable(newRoutingTable).build();
}
});
routingTableDirty = false;
} catch (Exception e) {
logger.warn("Failed to reroute routing table", e);
}