Skip to content

Merge template mappings properly during validation #124784

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.

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
merged 3 commits into from
Mar 17, 2025

Conversation

kkrik-es
Copy link
Contributor

Template validation in MetadataIndexTemplateService doesn't merge template mappings with the appropriate reason.

Fixes #123372

@kkrik-es kkrik-es added >bug Team:StorageEngine :StorageEngine/Mapping The storage related side of mappings labels Mar 13, 2025
@kkrik-es kkrik-es self-assigned this Mar 13, 2025
@elasticsearchmachine
Copy link
Collaborator

Hi @kkrik-es, I've created a changelog YAML for you.

@kkrik-es kkrik-es marked this pull request as ready for review March 13, 2025 18:36
@kkrik-es kkrik-es requested a review from martijnvg March 13, 2025 18:36
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-storage-engine (Team:StorageEngine)

@kkrik-es kkrik-es added auto-backport Automatically create backport pull requests when merged v8.18.1 v8.19.0 v9.0.1 labels Mar 13, 2025
Copy link
Member

@martijnvg martijnvg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@kkrik-es kkrik-es removed the v8.18.1 label Mar 17, 2025
@kkrik-es kkrik-es merged commit b861f10 into elastic:main Mar 17, 2025
17 checks passed
@elasticsearchmachine
Copy link
Collaborator

💚 Backport successful

Status Branch Result
8.x
9.0

kkrik-es added a commit to kkrik-es/elasticsearch that referenced this pull request Mar 17, 2025
* Merge template mappings properly during validation

* Update docs/changelog/124784.yaml
@kkrik-es
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
8.18

Questions ?

Please refer to the Backport tool documentation

kkrik-es added a commit to kkrik-es/elasticsearch that referenced this pull request Mar 17, 2025
* Merge template mappings properly during validation

* Update docs/changelog/124784.yaml

(cherry picked from commit b861f10)
elasticsearchmachine pushed a commit that referenced this pull request Mar 17, 2025
…124997)

* Merge template mappings properly during validation (#124784)

* Merge template mappings properly during validation

* Update docs/changelog/124784.yaml

* Update MetadataIndexTemplateServiceTests.java
elasticsearchmachine pushed a commit that referenced this pull request Mar 17, 2025
…124996)

* Merge template mappings properly during validation (#124784)

* Merge template mappings properly during validation

* Update docs/changelog/124784.yaml

* Update MetadataIndexTemplateServiceTests.java
elasticsearchmachine pushed a commit that referenced this pull request Mar 17, 2025
…124998)

* Merge template mappings properly during validation (#124784)

* Merge template mappings properly during validation

* Update docs/changelog/124784.yaml

(cherry picked from commit b861f10)

* Update MetadataIndexTemplateServiceTests.java
weizijun added a commit to weizijun/elasticsearch that referenced this pull request Mar 17, 2025
* main: (95 commits)
  Mute org.elasticsearch.datastreams.lifecycle.DataStreamLifecycleServiceIT testLifecycleAppliedToFailureStore elastic#124999
  Merge template mappings properly during validation (elastic#124784)
  [Build] Rework internal build plugin plugin to work with Isolated Projects (elastic#123461)
  [Build] Require reason for usesDefaultDistribution (elastic#124707)
  Mute org.elasticsearch.packaging.test.DockerTests test011SecurityEnabledStatus elastic#124990
  Mute org.elasticsearch.xpack.ilm.TimeSeriesDataStreamsIT testRolloverAction elastic#124987
  Mute org.elasticsearch.packaging.test.BootstrapCheckTests test10Install elastic#124957
  Mute org.elasticsearch.integration.DataStreamLifecycleServiceRuntimeSecurityIT testRolloverLifecycleAndForceMergeAuthorized elastic#124978
  Mute org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT testStopQuery elastic#124977
  Mute org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT testStopQueryLocal elastic#121672
  Mention zero-window state in networking docs (elastic#124967)
  Remove remoteAddress field from TransportResponse (elastic#120016)
  Include failures in partial response (elastic#124929)
  Prevent work starvation bug if using scaling EsThreadPoolExecutor with core pool size = 0  (elastic#124732)
  Re-enable analysis stemmer test (elastic#124961)
  Mute org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT testStopQueryLocalNoRemotes elastic#124959
  ESQL: Catch parsing exception (elastic#124958)
  ESQL: Improve error message for ( and [ (elastic#124177)
  Mute org.elasticsearch.xpack.esql.qa.single_node.EsqlSpecIT test {lookup-join.MvJoinKeyFromRow SYNC} elastic#124951
  Mute org.elasticsearch.datastreams.lifecycle.DataStreamLifecycleServiceIT testErrorRecordingOnRetention elastic#124950
  ...

# Conflicts:
#	server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java
#	server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldTypeTests.java
omricohenn pushed a commit to omricohenn/elasticsearch that referenced this pull request Mar 28, 2025
* Merge template mappings properly during validation

* Update docs/changelog/124784.yaml
@kkrik-es kkrik-es deleted the fix/123372 branch June 19, 2025 11:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Automatically create backport pull requests when merged >bug :StorageEngine/Mapping The storage related side of mappings Team:StorageEngine v8.19.0 v9.0.1 v9.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Property merging in component template fails on subobjects:false
3 participants