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

Upgrade Python client to 7.14.0 #1302

Merged
merged 8 commits into from
Sep 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions esrally/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,11 +255,20 @@ async def on_request_end(session, trace_config_ctx, params):
self.client_options["serializer"] = LazyJSONSerializer()
self.client_options["trace_config"] = trace_config

class VerifiedAsyncTransport(elasticsearch.AsyncTransport):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
# skip verification at this point; we've already verified this earlier with the synchronous client.
# The async client is used in the hot code path and we use customized overrides (such as that we don't
# parse response bodies in some cases for performance reasons, e.g. when using the bulk API).
self._verified_elasticsearch = True

class RallyAsyncElasticsearch(elasticsearch.AsyncElasticsearch, RequestContextHolder):
pass

return RallyAsyncElasticsearch(
hosts=self.hosts,
transport_class=VerifiedAsyncTransport,
connection_class=esrally.async_connection.AIOHttpConnection,
ssl_context=self.ssl_context,
**self.client_options,
Expand Down
2 changes: 1 addition & 1 deletion it/tracker_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def test_cluster():
race_id = str(uuid.uuid4())

it.wait_until_port_is_free(port_number=port)
cluster.install(distribution_version=dist, node_name="rally-node", car="4gheap", http_port=port)
cluster.install(distribution_version=dist, node_name="rally-node", car="4gheap,basic-license", http_port=port)
cluster.start(race_id=race_id)
yield cluster
cluster.stop()
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def str_from_file(name):
# transitive dependencies:
# urllib3: MIT
# aiohttp: Apache 2.0
"elasticsearch[async]==7.10.1",
"elasticsearch[async]==7.14.0",
# License: BSD
"psutil==5.8.0",
# License: MIT
Expand Down