Skip to content

[9.0] Removing the type from the destination index when using CreateIndexFromSourceAction (#121982) #122058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elasticsearchmachine merged 1 commit into from
Feb 7, 2025
Merged

[9.0] Removing the type from the destination index when using CreateIndexFromSourceAction (#121982) #122058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...ain/java/org/elasticsearch/xpack/migrate/action/CreateIndexFromSourceTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,14 @@ private static Map<String, Object> toMap(@Nullable MappingMetadata sourceMapping
.orElse(Map.of());
}

@SuppressWarnings("unchecked")
private static Map<String, Object> mergeMappings(@Nullable MappingMetadata sourceMapping, Map<String, Object> mappingAddition)
throws IOException {
Map<String, Object> combinedMappingMap = new HashMap<>(toMap(sourceMapping));
XContentHelper.update(combinedMappingMap, mappingAddition, true);
if (sourceMapping != null && combinedMappingMap.size() == 1 && combinedMappingMap.containsKey(sourceMapping.type())) {
combinedMappingMap = (Map<String, Object>) combinedMappingMap.get(sourceMapping.type());
}
return combinedMappingMap;
}

Expand Down
24 changes: 23 additions & 1 deletion x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DataStreamsUpgradeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@

import org.apache.http.util.EntityUtils;
import org.elasticsearch.Build;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.Version;
import org.elasticsearch.client.Node;
import org.elasticsearch.client.Request;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.Response;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.client.WarningsHandler;
import org.elasticsearch.cluster.metadata.DataStream;
import org.elasticsearch.cluster.metadata.DataStreamTestHelper;
import org.elasticsearch.common.settings.SecureString;
Expand Down Expand Up @@ -418,8 +421,27 @@ private void createDataStreamFromNonDataStreamIndices(String dataStreamFromNonDa
putIndexTemplateRequest.setJsonEntity(
indexTemplate.replace("$TEMPLATE", templateWithNoTimestamp).replace("$PATTERN", dataStreamFromNonDataStreamIndices + "-*")
);
assertOK(client().performRequest(putIndexTemplateRequest));
String indexName = dataStreamFromNonDataStreamIndices + "-01";
if (minimumTransportVersion().before(TransportVersions.V_8_0_0)) {
/*
* It is not possible to create a 7.x index template with a type. And you can't create an empty index with a type. But you can
* create the index with a type by posting a document to an index with a type. We do that here so that we test that the type is
* removed when we reindex into 8.x.
*/
String typeName = "test-type";
Request createIndexRequest = new Request("POST", indexName + "/" + typeName);
createIndexRequest.setJsonEntity("""
{
"@timestamp": "2099-11-15T13:12:00",
"message": "GET /search HTTP/1.1 200 1070000",
"user": {
"id": "kimchy"
}
}""");
createIndexRequest.setOptions(RequestOptions.DEFAULT.toBuilder().setWarningsHandler(WarningsHandler.PERMISSIVE).build());
assertOK(client().performRequest(createIndexRequest));
}
assertOK(client().performRequest(putIndexTemplateRequest));
bulkLoadDataMissingTimestamp(indexName);
/*
* Next, we will change the index's mapping to include a @timestamp field since we are going to convert it to a data stream. But
Expand Down