|
@@ -197,7 +197,7 @@ public class TransportSimulateIndexTemplateAction extends TransportMasterNodeRea
|
|
|
final SystemIndices systemIndices,
|
|
|
Set<IndexSettingProvider> indexSettingProviders
|
|
|
) throws Exception {
|
|
|
- Settings settings = resolveSettings(simulatedState.metadata(), matchingTemplate);
|
|
|
+ Settings templateSettings = resolveSettings(simulatedState.metadata(), matchingTemplate);
|
|
|
|
|
|
List<Map<String, AliasMetadata>> resolvedAliases = MetadataIndexTemplateService.resolveAliases(
|
|
|
simulatedState.metadata(),
|
|
@@ -213,19 +213,20 @@ public class TransportSimulateIndexTemplateAction extends TransportMasterNodeRea
|
|
|
.put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID());
|
|
|
|
|
|
// First apply settings sourced from index settings providers
|
|
|
+ Settings.Builder additionalSettings = Settings.builder();
|
|
|
for (var provider : indexSettingProviders) {
|
|
|
- dummySettings.put(
|
|
|
- provider.getAdditionalIndexSettings(
|
|
|
- indexName,
|
|
|
- template.getDataStreamTemplate() != null ? indexName : null,
|
|
|
- simulatedState.getMetadata(),
|
|
|
- System.currentTimeMillis(),
|
|
|
- settings
|
|
|
- )
|
|
|
+ Settings result = provider.getAdditionalIndexSettings(
|
|
|
+ indexName,
|
|
|
+ template.getDataStreamTemplate() != null ? indexName : null,
|
|
|
+ simulatedState.getMetadata(),
|
|
|
+ System.currentTimeMillis(),
|
|
|
+ templateSettings
|
|
|
);
|
|
|
+ dummySettings.put(result);
|
|
|
+ additionalSettings.put(result);
|
|
|
}
|
|
|
// Then apply settings resolved from templates:
|
|
|
- dummySettings.put(settings);
|
|
|
+ dummySettings.put(templateSettings);
|
|
|
|
|
|
final IndexMetadata indexMetadata = IndexMetadata.builder(indexName).settings(dummySettings).build();
|
|
|
|
|
@@ -274,6 +275,7 @@ public class TransportSimulateIndexTemplateAction extends TransportMasterNodeRea
|
|
|
}
|
|
|
);
|
|
|
|
|
|
+ Settings settings = Settings.builder().put(templateSettings).put(additionalSettings.build()).build();
|
|
|
return new Template(settings, mergedMapping, aliasesByName);
|
|
|
}
|
|
|
}
|