Skip to content

Commit 9a09261

Browse files
committed
remove checking for client node on rivers, its automatically done with master and non river node anyhow
1 parent 648da2e commit 9a09261

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/PublishRiverClusterStateAction.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ public void publish(RiverClusterState clusterState) {
7272
// master nodes because they will handle the state and the allocation of rivers
7373
// and river nodes since they will end up creating indexes
7474

75-
if (node.clientNode()) {
76-
continue;
77-
}
78-
7975
if (!node.masterNode() && !RiverNodeHelper.isRiverNode(node)) {
8076
continue;
8177
}

modules/elasticsearch/src/main/java/org/elasticsearch/river/cluster/RiverNodeHelper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
public class RiverNodeHelper {
2929

3030
public static boolean isRiverNode(DiscoveryNode node) {
31+
// we don't allocate rivers on client nodes
3132
if (node.clientNode()) {
3233
return false;
3334
}

0 commit comments

Comments
 (0)