From 8675784e3fbf45304f03698dbe66dac9452d562f Mon Sep 17 00:00:00 2001 From: javanna Date: Thu, 7 Jan 2016 18:59:14 +0100 Subject: [PATCH] adapt error message when node.ingest is set to false and we fail executing a pipeline --- .../action/ingest/IngestDisabledActionFilter.java | 2 +- .../test/ingest_mustache/10_ingest_disabled.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/action/ingest/IngestDisabledActionFilter.java b/core/src/main/java/org/elasticsearch/action/ingest/IngestDisabledActionFilter.java index 0dd7b4a1eff..3603b882e4b 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/IngestDisabledActionFilter.java +++ b/core/src/main/java/org/elasticsearch/action/ingest/IngestDisabledActionFilter.java @@ -52,7 +52,7 @@ public final class IngestDisabledActionFilter implements ActionFilter { } private static void failRequest(String pipelineId) { - throw new IllegalArgumentException("ingest plugin is disabled, cannot execute pipeline with id [" + pipelineId + "]"); + throw new IllegalArgumentException("node.ingest is set to false, cannot execute pipeline with id [" + pipelineId + "]"); } } diff --git a/qa/ingest-disabled/src/test/resources/rest-api-spec/test/ingest_mustache/10_ingest_disabled.yaml b/qa/ingest-disabled/src/test/resources/rest-api-spec/test/ingest_mustache/10_ingest_disabled.yaml index 156455c0957..957fbd29d2c 100644 --- a/qa/ingest-disabled/src/test/resources/rest-api-spec/test/ingest_mustache/10_ingest_disabled.yaml +++ b/qa/ingest-disabled/src/test/resources/rest-api-spec/test/ingest_mustache/10_ingest_disabled.yaml @@ -79,7 +79,7 @@ --- "Test index api with pipeline id fails when node.ingest is set to false": - do: - catch: /ingest plugin is disabled, cannot execute pipeline with id \[my_pipeline_1\]/ + catch: /node.ingest is set to false, cannot execute pipeline with id \[my_pipeline_1\]/ index: index: test type: test @@ -94,7 +94,7 @@ --- "Test bulk api with pipeline id fails when node.ingest is set to false": - do: - catch: /ingest plugin is disabled, cannot execute pipeline with id \[my_pipeline_1\]/ + catch: /node.ingest is set to false, cannot execute pipeline with id \[my_pipeline_1\]/ bulk: pipeline: "my_pipeline_1" body: