Made small modifications to ESRestTestCase. #70531
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Don't try to invoke delete component/index templates APIs if there are no templates to delete. * Don't delete deprecation templates by marking these as xpack templates. Relates to elastic#69973
martijnvg
added
>test
elasticmachine
added
the
Team:Data Management
|
Pinging @elastic/es-core-features (Team:Core/Features) |
martijnvg
commented
Mar 17, 2021
| @@ -1391,6 +1395,9 @@ protected static boolean isXPackTemplate(String name) { | |||
| if (name.startsWith(".transform-")) { | |||
| return true; | |||
| } | |||
| if (name.startsWith(".deprecation-")) { | |||
There was a problem hiding this comment.
This is for: .deprecation-indexing-mappings, .deprecation-indexing-settings and .deprecation-indexing-template templates.
martijnvg
commented
Mar 17, 2021
| @@ -1391,6 +1395,9 @@ protected static boolean isXPackTemplate(String name) { | |||
| if (name.startsWith(".transform-")) { | |||
| return true; | |||
| } | |||
| if (name.startsWith(".deprecation-")) { | |||
There was a problem hiding this comment.
Referencing #66413 here, because all this logic in this class about protecting xpack related templates wouldn't be needed if these component and composable index templates are system owned.
dakrone
approved these changes
Mar 17, 2021
Good idea, perhaps this could work. I will try this out. I do wonder how much this going to help for the slow build machines. |
martijnvg
added a commit
to martijnvg/elasticsearch
that referenced
this pull request
Mar 18, 2021
Backporting elastic#70531 to the 7.x branch. * Don't try to invoke delete component/index templates APIs if there are no templates to delete. * Don't delete deprecation templates by marking these as xpack templates. Relates to elastic#69973
martijnvg
added a commit
that referenced
this pull request
Mar 18, 2021
martijnvg
added a commit
to martijnvg/elasticsearch
that referenced
this pull request
Mar 18, 2021
Backporting elastic#70531 to the 7.12 branch. * Don't try to invoke delete component/index templates APIs if there are no templates to delete. * Don't delete deprecation templates by marking these as xpack templates. Relates to elastic#69973
martijnvg
added a commit
to martijnvg/elasticsearch
that referenced
this pull request
Mar 18, 2021
Backporting elastic#70531 to the 7.11 branch. * Don't try to invoke delete component/index templates APIs if there are no templates to delete. * Don't delete deprecation templates by marking these as xpack templates. Relates to elastic#69973
martijnvg
added a commit
that referenced
this pull request
Mar 18, 2021
martijnvg
added a commit
that referenced
this pull request
Mar 18, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Relates to #69973