INGEST: Allow Repeated Invocation of Pipeline (elastic#33419)

* Allows repeated, non-recursive invocation of the same pipeline
jakelandis · Oct 21, 2018 · f1db75d · f1db75d
1 parent 28bbf45
commit f1db75d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/...s/ingest-common/src/test/java/org/elasticsearch/ingest/common/PipelineProcessorTests.java b/...s/ingest-common/src/test/java/org/elasticsearch/ingest/common/PipelineProcessorTests.java
@@ -113,4 +113,20 @@ public void testThrowsOnRecursivePipelineInvocations() throws Exception {
             "Recursive invocation of pipeline [inner] detected.", e.getRootCause().getMessage()
         );
     }
+
+    public void testAllowsRepeatedPipelineInvocations() throws Exception {
+        String innerPipelineId = "inner";
+        IngestService ingestService = mock(IngestService.class);
+        IngestDocument testIngestDocument = RandomDocumentPicks.randomIngestDocument(random(), new HashMap<>());
+        Map<String, Object> outerConfig = new HashMap<>();
+        outerConfig.put("pipeline", innerPipelineId);
+        PipelineProcessor.Factory factory = new PipelineProcessor.Factory(ingestService);
+        Pipeline inner = new Pipeline(
+            innerPipelineId, null, null, new CompoundProcessor()
+        );
+        when(ingestService.getPipeline(innerPipelineId)).thenReturn(inner);
+        Processor outerProc = factory.create(Collections.emptyMap(), null, outerConfig);
+        outerProc.execute(testIngestDocument);
+        outerProc.execute(testIngestDocument);
+    }
 }
diff --git a/server/src/main/java/org/elasticsearch/ingest/IngestDocument.java b/server/src/main/java/org/elasticsearch/ingest/IngestDocument.java
@@ -649,10 +649,14 @@ private static Object deepCopy(Object value) {
      * @throws Exception On exception in pipeline execution
      */
     public IngestDocument executePipeline(Pipeline pipeline) throws Exception {
-        if (this.executedPipelines.add(pipeline) == false) {
-            throw new IllegalStateException("Recursive invocation of pipeline [" + pipeline.getId() + "] detected.");
+        try {
+            if (this.executedPipelines.add(pipeline) == false) {
+                throw new IllegalStateException("Recursive invocation of pipeline [" + pipeline.getId() + "] detected.");
+            }
+            return pipeline.execute(this);
+        } finally {
+            executedPipelines.remove(pipeline);
         }
-        return pipeline.execute(this);
     }
 
     @Override