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

Automatically detect OpenSearch version #3198

Merged
merged 6 commits into from Aug 11, 2021

Conversation

pavolloffay
Copy link
Member

Updates #3044

  • Automatically set ES version to 7 if OpenSearch 1x is used
  • Add OpenSearch to itests

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
@pavolloffay pavolloffay requested a review from a team as a code owner August 10, 2021 13:54
@pavolloffay
Copy link
Member Author

@albertteoh would you like to review?

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
@codecov
Copy link

codecov bot commented Aug 10, 2021

Codecov Report

Merging #3198 (e9b5bdb) into master (4019fe9) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3198   +/-   ##
=======================================
  Coverage   95.93%   95.93%           
=======================================
  Files         239      239           
  Lines       14661    14661           
=======================================
  Hits        14065    14065           
  Misses        519      519           
  Partials       77       77           
Impacted Files Coverage Δ
cmd/query/app/static_handler.go 95.80% <0.00%> (-1.80%) ⬇️
cmd/query/app/server.go 95.58% <0.00%> (+1.47%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4019fe9...e9b5bdb. Read the comment docs.

yurishkuro
yurishkuro previously approved these changes Aug 10, 2021
@jpkrohling
Copy link
Contributor

Are the test failures expected?

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
@@ -68,6 +69,12 @@ func (s *ESStorageIntegration) getVersion() (uint, error) {
if err != nil {
return 0, err
}
// OpenSearch is based on ES 7.x
if strings.Contains(pingResult.TagLine, "OpenSearch") {
Copy link
Member Author

Choose a reason for hiding this comment

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

this is unfortunate we should refactor the test to use the pkg/es/config

@pavolloffay
Copy link
Member Author

Are the test failures expected?

no it needed a bit more love. It should be fixed now and it needs re-approval.

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
@pavolloffay
Copy link
Member Author

still failed, I will have a look

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
@pavolloffay
Copy link
Member Author

alright so the rollover script needed the "opensearch" logic as well.

@pavolloffay pavolloffay merged commit 8f03e46 into jaegertracing:master Aug 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants