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

remove checking for client node on rivers, its automatically done with master and non river node anyhow

This commit is contained in:
kimchy 2010-10-17 19:20:37 +02:00
parent 648da2e6ff
commit 9a09261383
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/PublishRiverClusterStateAction.java
View File

@ -72,10 +72,6 @@ public class PublishRiverClusterStateAction extends AbstractComponent {
// master nodes because they will handle the state and the allocation of rivers // master nodes because they will handle the state and the allocation of rivers
// and river nodes since they will end up creating indexes // and river nodes since they will end up creating indexes
if (node.clientNode()) {
continue;
}
if (!node.masterNode() && !RiverNodeHelper.isRiverNode(node)) { if (!node.masterNode() && !RiverNodeHelper.isRiverNode(node)) {
continue; continue;
} }

1
modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverNodeHelper.java
View File

@ -28,6 +28,7 @@ import org.elasticsearch.river.RiverName;
public class RiverNodeHelper { public class RiverNodeHelper {
public static boolean isRiverNode(DiscoveryNode node) { public static boolean isRiverNode(DiscoveryNode node) {
// we don't allocate rivers on client nodes
if (node.clientNode()) { if (node.clientNode()) {
return false; return false;
} }