Ensure index templates are not applied to system indices #16418

pyek-bot · 2024-10-22T02:41:55Z

Description

Prevents index templates from applying to system indices

Related Issues

Resolves #16340

Check List

Functionality includes testing.
API changes companion pull request created, if applicable.
Public documentation issue/PR created, if applicable.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Pavan Yekbote <[email protected]>

pyek-bot · 2024-10-22T02:43:42Z

Please advice for backporting

dbwiddis

Approach LGTM.

How can we test this? I've been looking at MetadataCreateIndexTests and don't see that we ever test this method directly.

server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java

github-actions · 2024-10-23T17:36:35Z

✅ Gradle check result for 09a27c9: SUCCESS

dbwiddis

LGTM!

andrross

This change makes sense to me. Just one comment about the unit test. @dbwiddis is there any way to create an integration test of the scenario you observed that would validate this fix?

server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java

server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java

Signed-off-by: Pavan Yekbote <[email protected]>

github-actions · 2024-10-25T03:17:51Z

❌ Gradle check result for 852fb79: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Signed-off-by: Pavan Yekbote <[email protected]>

github-actions · 2024-10-25T19:05:58Z

❕ Gradle check result for 2d29659: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

reta · 2024-10-26T16:51:16Z

@andrross LGTY? thanks!

dbwiddis

Re-approving after the IT addition. Thanks for sticking with this, @pyek-bot !

Signed-off-by: Pavan Yekbote <[email protected]>

github-actions · 2024-10-29T18:59:22Z

❌ Gradle check result for d80f7d0: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

pyek-bot · 2024-10-29T19:07:58Z

Flaky tests:

org.opensearch.cluster.MinimumClusterManagerNodesIT.testThreeNodesNoClusterManagerBlock
Issue: [AUTOCUT] Gradle Check Flaky Test Report for MinimumClusterManagerNodesIT #14289
org.opensearch.indexing.IndexActionIT.testAutoGenerateIdNoDuplicates {p0={"cluster.indices.replication.strategy":"SEGMENT"}}
Issue: [BUG] IndexActionIT tests are flaky Shard [test][0] is still locked after 5 sec waiting #12408
org.opensearch.search.basic.SearchWithRandomExceptionsIT.testRandomExceptions {p0={"search.concurrent_segment_search.enabled":"true"}}
Issue: [AUTOCUT] Gradle Check Flaky Test Report for SearchWithRandomExceptionsIT #15828
org.opensearch.search.basic.SearchWithRandomExceptionsIT.testRandomExceptions {p0={"search.concurrent_segment_search.enabled":"false"}}
Issue: [AUTOCUT] Gradle Check Flaky Test Report for SearchWithRandomExceptionsIT #15828
org.opensearch.search.SearchTimeoutIT.testSimpleTimeout {p0={"search.concurrent_segment_search.enabled":"false"}}
Issue: [AUTOCUT] Gradle Check Flaky Test Report for SearchTimeoutIT #16056

pyek-bot · 2024-10-29T19:09:05Z

Need support to merge this PR, blocking merge due to flaky tests. Requesting either re-running workflow or merge please. Thanks!

github-actions · 2024-10-29T20:15:02Z

✅ Gradle check result for d80f7d0: SUCCESS

* fix: ensure system indices are processed without templates Signed-off-by: Pavan Yekbote <[email protected]> * refactor: overloaded method for creating without templates Signed-off-by: Pavan Yekbote <[email protected]> * test: adding test to check call for notemplates on system index Signed-off-by: Pavan Yekbote <[email protected]> * refactor: cchange modifier to package private and add entry in changelog Signed-off-by: Pavan Yekbote <[email protected]> * test: adding IT test Signed-off-by: Pavan Yekbote <[email protected]> * refactor: remove UT and add private modifiers Signed-off-by: Pavan Yekbote <[email protected]> * refactor: spotless changes Signed-off-by: Pavan Yekbote <[email protected]> --------- Signed-off-by: Pavan Yekbote <[email protected]> (cherry picked from commit 1e7c122) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…6518) * fix: ensure system indices are processed without templates * refactor: overloaded method for creating without templates * test: adding test to check call for notemplates on system index * refactor: cchange modifier to package private and add entry in changelog * test: adding IT test * refactor: remove UT and add private modifiers * refactor: spotless changes --------- (cherry picked from commit 1e7c122) Signed-off-by: Pavan Yekbote <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

fix: ensure system indices are processed without templates

9d80a9d

Signed-off-by: Pavan Yekbote <[email protected]>

github-actions bot added bug Something isn't working Indexing Indexing, Bulk Indexing and anything related to indexing labels Oct 22, 2024

pyek-bot mentioned this pull request Oct 22, 2024

[BUG] Composable index template mapping can prevent creating an index if mappings conflict #16340

Closed

pyek-bot changed the title ~~[Bug fix] Ensure index templates are not applied to system indices~~ Ensure index templates are not applied to system indices Oct 22, 2024

dbwiddis reviewed Oct 22, 2024

View reviewed changes

server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java Outdated Show resolved Hide resolved

server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java Outdated Show resolved Hide resolved

dbwiddis added the backport 2.x Backport to 2.x branch label Oct 22, 2024

dbwiddis approved these changes Oct 23, 2024

View reviewed changes

andrross reviewed Oct 23, 2024

View reviewed changes

server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java Outdated Show resolved Hide resolved

reta reviewed Oct 23, 2024

View reviewed changes

server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java Show resolved Hide resolved

reta added v3.0.0 Issues and PRs related to version 3.0.0 v2.19.0 Issues and PRs related to version 2.19.0 labels Oct 23, 2024

test: adding IT test

852fb79

Signed-off-by: Pavan Yekbote <[email protected]>

Merge branch 'main' into fix_no_templating_for_system_index

2d29659

Signed-off-by: Pavan Yekbote <[email protected]>

opensearch-ci-bot mentioned this pull request Oct 26, 2024

[AUTOCUT] Gradle Check Flaky Test Report for AzureBlobStoreRepositoryTests #14291

Open

reta approved these changes Oct 26, 2024

View reviewed changes

dbwiddis approved these changes Oct 27, 2024

View reviewed changes

pyek-bot requested a review from andrross October 28, 2024 19:35

pyek-bot added 2 commits October 29, 2024 10:43

refactor: remove UT and add private modifiers

a19f1e3

Signed-off-by: Pavan Yekbote <[email protected]>

refactor: spotless changes

d80f7d0

Signed-off-by: Pavan Yekbote <[email protected]>

andrross approved these changes Oct 29, 2024

View reviewed changes

andrross merged commit 1e7c122 into opensearch-project:main Oct 29, 2024
39 of 40 checks passed

opensearch-trigger-bot bot mentioned this pull request Oct 29, 2024

[Backport 2.x] Ensure index templates are not applied to system indices #16518

Merged

This was referenced Oct 30, 2024

[AUTOCUT] Gradle Check Flaky Test Report for MinimumClusterManagerNodesIT #14289

Open

[AUTOCUT] Gradle Check Flaky Test Report for SearchTimeoutIT #16056

Open

cwperks mentioned this pull request Oct 31, 2024

Forward port integ test fixes to main branch opensearch-project/security#4867

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ensure index templates are not applied to system indices #16418

Ensure index templates are not applied to system indices #16418

pyek-bot commented Oct 22, 2024 •

edited

Loading

pyek-bot commented Oct 22, 2024

dbwiddis left a comment

github-actions bot commented Oct 23, 2024

dbwiddis left a comment

andrross left a comment

github-actions bot commented Oct 25, 2024

github-actions bot commented Oct 25, 2024

reta commented Oct 26, 2024

dbwiddis left a comment

github-actions bot commented Oct 29, 2024

pyek-bot commented Oct 29, 2024

pyek-bot commented Oct 29, 2024

github-actions bot commented Oct 29, 2024

Ensure index templates are not applied to system indices #16418

Ensure index templates are not applied to system indices #16418

Conversation

pyek-bot commented Oct 22, 2024 • edited Loading

Description

Related Issues

Check List

pyek-bot commented Oct 22, 2024

dbwiddis left a comment

Choose a reason for hiding this comment

github-actions bot commented Oct 23, 2024

dbwiddis left a comment

Choose a reason for hiding this comment

andrross left a comment

Choose a reason for hiding this comment

github-actions bot commented Oct 25, 2024

github-actions bot commented Oct 25, 2024

reta commented Oct 26, 2024

dbwiddis left a comment

Choose a reason for hiding this comment

github-actions bot commented Oct 29, 2024

pyek-bot commented Oct 29, 2024

pyek-bot commented Oct 29, 2024

github-actions bot commented Oct 29, 2024

pyek-bot commented Oct 22, 2024 •

edited

Loading