Polishing

Author: felixbarny

x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/TransportDownsampleAction.java

@@ -934,6 +934,7 @@ private void createDownsampleIndex(
             .put(IndexMetadata.INDEX_DOWNSAMPLE_STATUS.getKey(), DownsampleTaskStatus.STARTED)
             .put(IndexMetadata.INDEX_DOWNSAMPLE_INTERVAL.getKey(), downsampleInterval)
             .put(IndexSettings.MODE.getKey(), sourceIndexMetadata.getIndexMode())
+            .putList(IndexMetadata.INDEX_ROUTING_PATH.getKey(), sourceIndexMetadata.getRoutingPaths())
             .put(
                 IndexSettings.TIME_SERIES_START_TIME.getKey(),
                 sourceIndexMetadata.getSettings().get(IndexSettings.TIME_SERIES_START_TIME.getKey())
@@ -942,9 +943,6 @@ private void createDownsampleIndex(
                 IndexSettings.TIME_SERIES_END_TIME.getKey(),
                 sourceIndexMetadata.getSettings().get(IndexSettings.TIME_SERIES_END_TIME.getKey())
             );
-        if (sourceIndexMetadata.getRoutingPaths().isEmpty() == false) {
-            builder.putList(IndexMetadata.INDEX_ROUTING_PATH.getKey(), sourceIndexMetadata.getRoutingPaths());
-        }
         if (sourceIndexMetadata.getTimeSeriesDimensions().isEmpty() == false) {
             builder.putList(IndexMetadata.INDEX_DIMENSIONS.getKey(), sourceIndexMetadata.getTimeSeriesDimensions());
         }

x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleDataStreamTests.java

@@ -64,6 +64,7 @@
 import static org.elasticsearch.cluster.metadata.MetadataIndexTemplateService.DEFAULT_TIMESTAMP_FIELD;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.nullValue;
 
 public class DownsampleDataStreamTests extends ESSingleNodeTestCase {
 
@@ -228,6 +229,8 @@ private void putComposableIndexTemplate(final String id, final List<String> patt
             composableIndexTemplate.template().settings().hasValue(IndexMetadata.INDEX_ROUTING_PATH.getKey()),
             equalTo(manuallyAddedRoutingPathSetting)
         );
+        // the index.dimensions setting will not be present in the template settings, it is added at index creation time
+        assertThat(composableIndexTemplate.template().settings().get(IndexMetadata.INDEX_DIMENSIONS.getKey()), nullValue());
     }
 
     private void indexDocs(final String dataStream, int numDocs, long startTime) {