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

move assert that proxy filter should be installed on non ingest nodes only

This commit is contained in:
javanna 2016-01-12 15:48:28 +01:00 committed by Luca Cavanna
parent da0f934c52
commit 1dc5a6f3cf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/elasticsearch/action/ingest/IngestProxyActionFilter.java
View File

@ -31,6 +31,7 @@ import org.elasticsearch.action.support.ActionFilterChain;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.common.Randomness;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.inject.Inject;
@ -54,7 +55,6 @@ public final class IngestProxyActionFilter implements ActionFilter {
@Inject
public IngestProxyActionFilter(ClusterService clusterService, TransportService transportService) {
assert IngestModule.isIngestEnabled(clusterService.state().nodes().localNode().attributes()) == false;
this.clusterService = clusterService;
this.transportService = transportService;
}
@ -128,8 +128,10 @@ public final class IngestProxyActionFilter implements ActionFilter {
private DiscoveryNode randomIngestNode() {
ClusterState state = clusterService.state();
DiscoveryNodes nodes = state.nodes();
assert IngestModule.isIngestEnabled(nodes.localNode().attributes()) == false;
List<DiscoveryNode> ingestNodes = new ArrayList<>();
for (DiscoveryNode node : state.nodes()) {
for (DiscoveryNode node : nodes) {
if (IngestModule.isIngestEnabled(node.getAttributes())) {
ingestNodes.add(node);
}

2
core/src/test/java/org/elasticsearch/action/ingest/IngestProxyActionFilterTests.java
View File

@ -78,8 +78,6 @@ public class IngestProxyActionFilterTests extends ESTestCase {
}
builder.put(new DiscoveryNode(nodeId, nodeId, DummyTransportAddress.INSTANCE, attributes, VersionUtils.randomVersion(random())));
}
//at least one node must not have ingest enabled, and that will always be the last one
builder.localNodeId("node" + (totalNodes - 1));
when(clusterState.nodes()).thenReturn(builder.build());
ClusterService clusterService = mock(ClusterService.class);
when(clusterService.state()).thenReturn(clusterState);