Fix system index mapping update for reindexed indices after migration by alexey-ivanov-es · Pull Request #144782 · elastic/elasticsearch

alexey-ivanov-es · 2026-03-23T16:43:40Z

SystemIndexMappingUpdateService used projectMetadata.hasIndexAbstraction(d.getPrimaryIndex()) to collect system indices descriptors to check mappings, but then used state.metadata().index(descriptor.getPrimaryIndex()) to get IndexMetadata. This works with indices that were not reindexed, since their name is always the same as the system index's primary name, but after reindexing during migration, the index gains -reindexed-for-<version> suffix and has an alias with the primary name pointing to it. However, index method doesn't support aliases, therefore, IndexMetadata wasn't resolved and mappings were not checked.

This change fixes that by introducing use of indices lookup, if there is no metadata for the primary index.

Closes: #144764

…sion migrations

elasticsearchmachine · 2026-03-23T16:44:06Z

Pinging @elastic/es-core-infra (Team:Core/Infra)

elasticsearchmachine · 2026-03-23T16:44:31Z

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

coderabbitai · 2026-03-24T12:40:29Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: fd09734f-0f65-464b-b031-3e89120c31fb

📥 Commits

Reviewing files that changed from the base of the PR and between 319b651 and c41b3cf.

📒 Files selected for processing (4)

docs/changelog/144782.yaml
server/src/internalClusterTest/java/org/elasticsearch/indices/SystemIndexMappingUpdateServiceIT.java
server/src/main/java/org/elasticsearch/indices/SystemIndexMappingUpdateService.java
server/src/test/java/org/elasticsearch/indices/SystemIndexMappingUpdateServiceTests.java

📝 Walkthrough

Walkthrough

This change addresses system index mapping updates for indices that have been reindexed during major version migrations. The SystemIndexMappingUpdateService now includes a helper method (getSystemIndexMetadata) that resolves system index metadata via alias lookup when the primary index name is not found directly. This allows the service to correctly identify and update mappings on reindexed indices, which are renamed with a suffix and pointed to by an alias. Supporting tests and a changelog entry were added to document the fix.

🚥 Pre-merge checks | ✅ 2

✅ Passed checks (2 passed)

Check name	Status	Explanation
Linked Issues check	✅ Passed	Changes directly address issue `#144764`: modified SystemIndexMappingUpdateService to resolve alias-based reindexed indices via indices lookup, added unit and integration tests validating the fix.
Out of Scope Changes check	✅ Passed	All changes are scoped to system index mapping updates post-migration: service logic, unit tests, integration tests, and changelog entry—no unrelated modifications detected.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

🛠️ Update Documentation: Commit on current branch
🛠️ Update Documentation: Create PR

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

mamazzol · 2026-03-26T16:57:38Z

server/src/main/java/org/elasticsearch/indices/SystemIndexMappingUpdateService.java

     */
    static State calculateIndexState(ProjectState state, SystemIndexDescriptor descriptor) {
-        final IndexMetadata indexMetadata = state.metadata().index(descriptor.getPrimaryIndex());
+        IndexMetadata indexMetadata = getSystemIndexMetadata(state, descriptor);


nit: this is not final anymore, not sure if it's on purpose.

elasticsearchmachine · 2026-03-26T19:01:00Z

💔 Backport failed

Status	Branch	Result
✅	9.3
❌	8.19	Commit could not be cherrypicked due to conflicts
✅	9.2

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 144782

…elastic#144782) SystemIndexMappingUpdateService used projectMetadata.hasIndexAbstraction(d.getPrimaryIndex()) to collect system indices descriptors to check mappings, but then used state.metadata().index(descriptor.getPrimaryIndex()) to get IndexMetadata. This works with indices that were not reindexed, since their name is always the same as the system index's primary name, but after reindexing during migration, the index gains -reindexed-for-<version> suffix and has an alias with the primary name pointing to it. However, index method doesn't support aliases, therefore, IndexMetadata wasn't resolved and mappings were not checked. This change fixes that by introducing use of indices lookup, if there is no metadata for the primary index.

…gration (#144782) SystemIndexMappingUpdateService used projectMetadata.hasIndexAbstraction(d.getPrimaryIndex()) to collect system indices descriptors to check mappings, but then used state.metadata().index(descriptor.getPrimaryIndex()) to get IndexMetadata. This works with indices that were not reindexed, since their name is always the same as the system index's primary name, but after reindexing during migration, the index gains -reindexed-for-<version> suffix and has an alias with the primary name pointing to it. However, index method doesn't support aliases, therefore, IndexMetadata wasn't resolved and mappings were not checked. This change fixes that by introducing use of indices lookup, if there is no metadata for the primary index. (cherry picked from commit 29d7e2a)

alexey-ivanov-es · 2026-03-26T19:54:57Z

8.19 backport: #145031

…#144782) (#145026) SystemIndexMappingUpdateService used projectMetadata.hasIndexAbstraction(d.getPrimaryIndex()) to collect system indices descriptors to check mappings, but then used state.metadata().index(descriptor.getPrimaryIndex()) to get IndexMetadata. This works with indices that were not reindexed, since their name is always the same as the system index's primary name, but after reindexing during migration, the index gains -reindexed-for-<version> suffix and has an alias with the primary name pointing to it. However, index method doesn't support aliases, therefore, IndexMetadata wasn't resolved and mappings were not checked. This change fixes that by introducing use of indices lookup, if there is no metadata for the primary index.

…gration (#144782) (#145031) * [8.19] Fix system index mapping update for reindexed indices after migration (#144782) SystemIndexMappingUpdateService used projectMetadata.hasIndexAbstraction(d.getPrimaryIndex()) to collect system indices descriptors to check mappings, but then used state.metadata().index(descriptor.getPrimaryIndex()) to get IndexMetadata. This works with indices that were not reindexed, since their name is always the same as the system index's primary name, but after reindexing during migration, the index gains -reindexed-for-<version> suffix and has an alias with the primary name pointing to it. However, index method doesn't support aliases, therefore, IndexMetadata wasn't resolved and mappings were not checked. This change fixes that by introducing use of indices lookup, if there is no metadata for the primary index. (cherry picked from commit 29d7e2a) * Fix build

…ration (#144782) (#145025) SystemIndexMappingUpdateService used projectMetadata.hasIndexAbstraction(d.getPrimaryIndex()) to collect system indices descriptors to check mappings, but then used state.metadata().index(descriptor.getPrimaryIndex()) to get IndexMetadata. This works with indices that were not reindexed, since their name is always the same as the system index's primary name, but after reindexing during migration, the index gains -reindexed-for-<version> suffix and has an alias with the primary name pointing to it. However, index method doesn't support aliases, therefore, IndexMetadata wasn't resolved and mappings were not checked. This change fixes that by introducing use of indices lookup, if there is no metadata for the primary index.

Fix system index mapping update for reindexed indices after major-ver…

48c96d2

…sion migrations

alexey-ivanov-es added >bug auto-backport Automatically create backport pull requests when merged branch:9.2 branch:8.19 branch:9.3 :Core/Infra/System Indices labels Mar 23, 2026

elasticsearchmachine added Team:Core/Infra Meta label for core/infra team v9.4.0 v9.3.3 v8.19.14 v9.2.8 labels Mar 23, 2026

elasticsearchmachine removed branch:9.2 branch:8.19 branch:9.3 labels Mar 23, 2026

Update docs/changelog/144782.yaml

0376253

alexey-ivanov-es requested a review from a team March 23, 2026 16:47

elasticsearchmachine and others added 3 commits March 23, 2026 16:55

[CI] Auto commit changes from spotless

4275d46

Update area in changelog

8dde350

Merge branch 'main' into fix/144764

c41b3cf

alexey-ivanov-es added 3 commits March 24, 2026 16:08

Merge branch 'main' into fix/144764

3ae7da8

Merge branch 'main' into fix/144764

140c031

Merge branch 'main' into fix/144764

9bba819

mamazzol approved these changes Mar 26, 2026

View reviewed changes

alexey-ivanov-es merged commit 29d7e2a into elastic:main Mar 26, 2026
36 checks passed

alexey-ivanov-es deleted the fix/144764 branch March 26, 2026 18:59

alexey-ivanov-es restored the fix/144764 branch March 26, 2026 18:59

This was referenced Mar 26, 2026

[9.3] Fix system index mapping update for reindexed indices after migration (#144782) #145025

Merged

[9.2] Fix system index mapping update for reindexed indices after migration (#144782) #145026

Merged

elasticsearchmachine added the backport pending label Mar 26, 2026

alexey-ivanov-es deleted the fix/144764 branch March 26, 2026 19:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix system index mapping update for reindexed indices after migration#144782

Fix system index mapping update for reindexed indices after migration#144782
alexey-ivanov-es merged 8 commits intoelastic:mainfrom
alexey-ivanov-es:fix/144764

alexey-ivanov-es commented Mar 23, 2026 •

edited

Loading

Uh oh!

elasticsearchmachine commented Mar 23, 2026

Uh oh!

elasticsearchmachine commented Mar 23, 2026

Uh oh!

coderabbitai bot commented Mar 24, 2026

Walkthrough

Uh oh!

mamazzol Mar 26, 2026

Uh oh!

Uh oh!

elasticsearchmachine commented Mar 26, 2026

Uh oh!

alexey-ivanov-es commented Mar 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

alexey-ivanov-es commented Mar 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

elasticsearchmachine commented Mar 23, 2026

Uh oh!

elasticsearchmachine commented Mar 23, 2026

Uh oh!

coderabbitai bot commented Mar 24, 2026

Walkthrough

Uh oh!

mamazzol Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

elasticsearchmachine commented Mar 26, 2026

💔 Backport failed

Uh oh!

alexey-ivanov-es commented Mar 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

alexey-ivanov-es commented Mar 23, 2026 •

edited

Loading