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

Allow compression of Elasticsearch requests #31601

Merged
merged 1 commit into from
Jun 17, 2024

Conversation

Amar3tto
Copy link
Contributor

@Amar3tto Amar3tto commented Jun 14, 2024

Fixes #30641


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@Amar3tto Amar3tto force-pushed the elasticsearch-compression branch 2 times, most recently from cb2bb9d to 2bd97f0 Compare June 14, 2024 08:26
@Amar3tto Amar3tto marked this pull request as ready for review June 14, 2024 08:49
Copy link
Contributor

Assigning reviewers. If you would like to opt out of this review, comment assign to next reviewer:

R: @Abacn for label java.
R: @johnjcasey for label io.

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

@Amar3tto
Copy link
Contributor Author

R: @Abacn

Copy link
Contributor

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control

@Amar3tto
Copy link
Contributor Author

R: @johnjcasey

@@ -717,6 +738,7 @@ RestClient createClient() throws IOException {
Header[] headerList = new Header[getDefaultHeaders().size()];
restClientBuilder.setDefaultHeaders(getDefaultHeaders().toArray(headerList));
}
restClientBuilder.setCompressionEnabled(isCompressionEnabled());
Copy link
Contributor

Choose a reason for hiding this comment

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

I am thinking about whether we need to put setCompressionEnabled invocation in a branch in case user is still on old version of elasticsearch client

if (isCompressionEnabled()) {
  restClientBuilder.setCompressionEnabled(true);
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We can do it just in case

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@@ -27,7 +27,7 @@ enableJavaPerformanceTesting()
description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: 7.x"
ext.summary = "Tests of ElasticsearchIO on Elasticsearch 7.x"

def elastic_search_version = "7.13.4"
def elastic_search_version = "7.17.22"
Copy link
Contributor

Choose a reason for hiding this comment

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

The current change should make elasticsearch-test-5 and 6 to fail, however it is not the case, and I found the elasticsearch compatibility tests never configured to use intended client version, e.g.

+--- org.elasticsearch.client:elasticsearch-rest-client:6.4.0 -> 7.9.2 (*)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, so I preferred not to change anything related to 5 and 6 in this PR

Copy link
Contributor

Choose a reason for hiding this comment

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

agree. Fix elasticsearch compatibility test to use intended client version could be a followup. If infeasible to support lower versions (5, 6) we can remove those test projects as they are already eol

@Amar3tto Amar3tto force-pushed the elasticsearch-compression branch from 2bd97f0 to 5daf234 Compare June 17, 2024 15:40
@Abacn Abacn merged commit 5feba0d into apache:master Jun 17, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature Request]: Allow compression of Elasticsearch requests
2 participants