Skip to content
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

Ensure index templates are not applied to system indices #16418

Merged

Conversation

pyek-bot
Copy link
Contributor

@pyek-bot pyek-bot commented Oct 22, 2024

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 <mail2pavanyekbote@gmail.com>
@pyek-bot
Copy link
Contributor Author

Please advice for backporting

@pyek-bot 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
Copy link
Member

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

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

Approach LGTM.

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

@dbwiddis dbwiddis added the backport 2.x Backport to 2.x branch label Oct 22, 2024
@reta 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
Signed-off-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>
Copy link
Contributor

❌ 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 <mail2pavanyekbote@gmail.com>
Copy link
Contributor

❕ 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
Copy link
Collaborator

reta commented Oct 26, 2024

@andrross LGTY? thanks!

Copy link
Member

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

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

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

@pyek-bot pyek-bot requested a review from andrross October 28, 2024 19:35
Signed-off-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>
Signed-off-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>
Copy link
Contributor

❌ 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
Copy link
Contributor Author

Flaky tests:

@pyek-bot
Copy link
Contributor Author

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

Copy link
Contributor

✅ Gradle check result for d80f7d0: SUCCESS

@andrross andrross merged commit 1e7c122 into opensearch-project:main Oct 29, 2024
39 of 40 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 29, 2024
* fix: ensure system indices are processed without templates

Signed-off-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>

* refactor: overloaded method for creating without templates

Signed-off-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>

* test: adding test to check call for notemplates on system index

Signed-off-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>

* refactor: cchange modifier to package private and add entry in changelog

Signed-off-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>

* test: adding IT test

Signed-off-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>

* refactor: remove UT and add private modifiers

Signed-off-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>

* refactor: spotless changes

Signed-off-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>

---------

Signed-off-by: Pavan Yekbote <mail2pavanyekbote@gmail.com>
(cherry picked from commit 1e7c122)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
reta pushed a commit that referenced this pull request Oct 29, 2024
…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 <mail2pavanyekbote@gmail.com>
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch bug Something isn't working Indexing Indexing, Bulk Indexing and anything related to indexing v2.19.0 Issues and PRs related to version 2.19.0 v3.0.0 Issues and PRs related to version 3.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Composable index template mapping can prevent creating an index if mappings conflict
5 participants