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.

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

Jump to bottom

Ensure index templates are not applied to system indices #16418

Merged
merged 9 commits into from
Oct 29, 2024
Merged

Ensure index templates are not applied to system indices #16418

merged 9 commits into from
Oct 29, 2024

Conversation

pyek-bot
Copy link
Contributor

@pyek-bot pyek-bot commented Oct 22, 2024 •
edited
Loading

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.

@github-actions github-actions bot added bug Something isn't working Indexing Indexing, Bulk Indexing and anything related to indexing labels Oct 22, 2024
@pyek-bot pyek-bot mentioned this pull request Oct 22, 2024
Closed
@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
dbwiddis
dbwiddis reviewed Oct 22, 2024
View reviewed changes
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.

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 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
@pyek-bot
test: adding IT test
852fb79 
Signed-off-by: Pavan Yekbote <[email protected]>
@github-actions GitHub Actions
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?

@github-actions GitHub Actions
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.

@opensearch-ci-bot opensearch-ci-bot mentioned this pull request Oct 26, 2024
Open
@reta
Copy link
Collaborator

reta commented Oct 26, 2024

@andrross LGTY? thanks!

dbwiddis
dbwiddis approved these changes Oct 27, 2024
View reviewed changes
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 !

@github-actions GitHub Actions
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!

@github-actions GitHub Actions
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
@github-actions
Ensure index templates are not applied to system indices (#16418)
e1a86fa 
* 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>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Oct 29, 2024
Merged
reta pushed a commit that referenced this pull request Oct 29, 2024
@opensearch-trigger-bot @github-actions
Ensure index templates are not applied to system indices (#16418) (#1…
bdcfcd0 
…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>
This was referenced Oct 30, 2024
Open
Open
@cwperks cwperks mentioned this pull request Oct 31, 2024
Merged
5 tasks
This was referenced Nov 6, 2024
Open
Closed
@cwperks cwperks mentioned this pull request Nov 19, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cwperks cwperks cwperks left review comments

@dbwiddis dbwiddis dbwiddis approved these changes

@reta reta reta approved these changes

@andrross andrross andrross approved these changes

@anasalkouz anasalkouz Awaiting requested review from anasalkouz anasalkouz is a code owner

@ashking94 ashking94 Awaiting requested review from ashking94 ashking94 is a code owner

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar Bukhtawar is a code owner

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE CEHENKLE is a code owner

@dblock dblock Awaiting requested review from dblock dblock is a code owner

@gbbafna gbbafna Awaiting requested review from gbbafna gbbafna is a code owner

@jainankitk jainankitk Awaiting requested review from jainankitk jainankitk is a code owner

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

@linuxpi linuxpi Awaiting requested review from linuxpi linuxpi is a code owner

@mch2 mch2 Awaiting requested review from mch2 mch2 is a code owner

@msfroh msfroh Awaiting requested review from msfroh msfroh is a code owner

@nknize nknize Awaiting requested review from nknize nknize is a code owner

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19 owaiskazi19 is a code owner

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159 Rishikesh1159 is a code owner

@sachinpkale sachinpkale Awaiting requested review from sachinpkale sachinpkale is a code owner

@saratvemulapalli saratvemulapalli Awaiting requested review from saratvemulapalli saratvemulapalli is a code owner

@shwetathareja shwetathareja Awaiting requested review from shwetathareja shwetathareja is a code owner

@sohami sohami Awaiting requested review from sohami sohami is a code owner

@VachaShah VachaShah Awaiting requested review from VachaShah VachaShah is a code owner

Assignees
No one assigned
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
Milestone
No milestone
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
@pyek-bot @dbwiddis @reta @andrross @cwperks