Fix rally-annotations index creation#1747
Merged
gbanasiak merged 2 commits intoelastic:masterfrom Jul 13, 2023
Merged
Conversation
Upgraded Python Elasticsearch client is more strict when evaluating `body` parameter in index `create` method. This had broken `rally-annotations` index creation in Elasticsearch metric store. This commit fixes `rally-annotations` index creation adopting the approach from other Rally indices which all use index templates.
gbanasiak
commented
Jul 12, 2023
b-deam
approved these changes
Jul 13, 2023
Member
b-deam
left a comment
There was a problem hiding this comment.
LGTM. The extra shards for annotations isn't a big enough deal to bother refactoring the code to allow overrides per template IMHO.
This file contains hidden or 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
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.
Addresses #1746.
The following naive fix reveals more problems:
Output:
Stack trace:
Therefore the problem is not only the missing
indexobject inannotations-template.jsonwhich is what #1746 suggests but also upgraded Python Elasticsearch client is more strict when evaluatingbodyparameter in indexcreatemethod.This PR addresses the problem by aligning
rally-annotationsindex creation handling with other indices, i.e. by usingrally-annotationsindex template. This simplicity comes at a cost of slightly "wasteful" configuration if users decided to increasedatastore.number_of_shardssetting (rally-annotationsis tiny).I've tested the change in staging environment: