CR: Force the _none pipeline on all requests that have a null pipelin…

…e set
elastic · Aug 1, 2018 · 6a9ebae · 6a9ebae
1 parent b6d3ecb
commit 6a9ebae
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
@@ -135,10 +135,12 @@ protected void doExecute(Task task, BulkRequest bulkRequest, ActionListener<Bulk
                 String pipeline = indexRequest.getPipeline();
                 if (pipeline == null) {
                     IndexMetaData indexMetaData = indicesMetaData.get(indexRequest.index());
-                    if (indexMetaData != null) {
+                    if (indexMetaData == null) {
+                        indexRequest.setPipeline(IngestService.NOOP_PIPELINE_NAME);
+                    } else {
                         String defaultPipeline = IndexSettings.DEFAULT_PIPELINE.get(indexMetaData.getSettings());
+                        indexRequest.setPipeline(defaultPipeline);
                         if (IngestService.NOOP_PIPELINE_NAME.equals(defaultPipeline) == false) {
-                            indexRequest.setPipeline(defaultPipeline);
                             hasIndexRequestsWithPipelines = true;
                         }
                     }