honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fail with a better error when if there are no ingest nodes (#48272)

Browse Source 
when executing enrich execute policy api.
This commit is contained in:
Martijn van Groningen 2019-10-22 07:41:26 +02:00
parent 0ec0ab64c9
commit bbe50eca72
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportExecuteEnrichPolicyAction.java
View File

@ -62,6 +62,12 @@ public class TransportExecuteEnrichPolicyAction
@Override @Override
protected void masterOperation(ExecuteEnrichPolicyAction.Request request, ClusterState state, protected void masterOperation(ExecuteEnrichPolicyAction.Request request, ClusterState state,
ActionListener<ExecuteEnrichPolicyAction.Response> listener) { ActionListener<ExecuteEnrichPolicyAction.Response> listener) {
if (state.getNodes().getIngestNodes().isEmpty()) {
// if we don't fail here then reindex will fail with a more complicated error.
// (EnrichPolicyRunner uses a pipeline with reindex)
throw new IllegalStateException("no ingest nodes in this cluster");
}
if (request.isWaitForCompletion()) { if (request.isWaitForCompletion()) {
executor.runPolicy(request, new ActionListener<ExecuteEnrichPolicyStatus>() { executor.runPolicy(request, new ActionListener<ExecuteEnrichPolicyStatus>() {
@Override @Override

13
x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichMultiNodeIT.java
View File

@ -134,6 +134,19 @@ public class EnrichMultiNodeIT extends ESIntegTestCase {
enrich(keys, ingestOnlyNode); enrich(keys, ingestOnlyNode);
} }
public void testEnrichNoIngestNodes() {
Settings settings = Settings.builder()
.put(Node.NODE_MASTER_SETTING.getKey(), true)
.put(Node.NODE_DATA_SETTING.getKey(), true)
.put(Node.NODE_INGEST_SETTING.getKey(), false)
.build();
internalCluster().startNode(settings);
createSourceIndex(64);
Exception e = expectThrows(IllegalStateException.class, EnrichMultiNodeIT::createAndExecutePolicy);
assertThat(e.getMessage(), equalTo("no ingest nodes in this cluster"));
}
private static void enrich(List<String> keys, String coordinatingNode) { private static void enrich(List<String> keys, String coordinatingNode) {
int numDocs = 256; int numDocs = 256;
BulkRequest bulkRequest = new BulkRequest("my-index"); BulkRequest bulkRequest = new BulkRequest("my-index");