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

Modify rally to allow multiple cars with complex configuration #1859

Merged
merged 26 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
957bd48
Modify rally to allow multiple cars with complex configuration
favilo Jun 21, 2024
ab3bd18
Fixing tests
favilo Jun 21, 2024
8dd2153
Fixing lints
favilo Jun 21, 2024
6b9791b
Fix rally-tracks-compat nox test
favilo Jun 21, 2024
5d65ef5
Fix issue pointed out by @AI-IshanBhatt
favilo Jun 28, 2024
72a6009
Fix mypy `type-arg` error I introduced
favilo Jun 28, 2024
f61259e
Add sys.path.insert back
favilo Jun 28, 2024
a2f8073
Introduce mypy overrides
gbanasiak Jul 1, 2024
3577265
Add local .venv interpretter to mypy configuration for ease of local
favilo Jul 1, 2024
60b1d5f
Add comment explaining `spec_from_file_location` and friends
favilo Jul 1, 2024
8a21d64
Remove executable for CI.
favilo Jul 1, 2024
2cafe29
Pin types-tabulate
gbanasiak Jul 2, 2024
3e03eea
I went a little buckwild while fixing type annotations.
favilo Jul 2, 2024
0660ab9
Make stdin more generic
favilo Jul 2, 2024
f6c7aa8
Shouldn't have used an assert there
favilo Jul 2, 2024
4d0a3e2
Replace Generator with Iterator
favilo Jul 2, 2024
d21ad4b
testing $VIRTUAL_ENV for python_executable.
favilo Jul 3, 2024
2058474
Switch to local repo for mypy in pre-commit config
gbanasiak Jul 8, 2024
78e5c3f
Remove python_executable since it breaks GH actions.
favilo Jul 8, 2024
4dd0909
Change to newer version of `black` so we don't have unnecessary blank
favilo Jul 8, 2024
b94c1a1
Add type annotations with overrides to allow setting the default
favilo Jul 8, 2024
56ef7e5
Remove `Any` from file return types.
favilo Jul 8, 2024
4981f13
new black version required new formatting
favilo Jul 8, 2024
e302785
Add typing_extensions, so we can more easily return a generic type from
favilo Jul 8, 2024
60c8f03
Moving typing-extensions to dependencies, since it is required
favilo Jul 8, 2024
f5125d2
Change FileOffsetTable file object type from bytes to str
gbanasiak Jul 9, 2024
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
6 changes: 6 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ repos:
rev: v1.6.1
hooks:
- id: mypy
additional_dependencies: [
"elasticsearch[async]==8.6.1",
"elastic-transport==8.4.1",
"types-tabulate==0.8.9",
]
args: [
"--ignore-missing-imports",
"--config",
"pyproject.toml"
]
Expand Down
4 changes: 2 additions & 2 deletions esrally/client/asynchronous.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ async def send(self, conn: "Connection") -> "ClientResponse":
self.response = self.response_class(
self.method,
self.original_url,
writer=self._writer,
writer=self._writer, # type: ignore[arg-type] # TODO remove this ignore when introducing type hints
gbanasiak marked this conversation as resolved.
Show resolved Hide resolved
continue100=self._continue,
timer=self._timer,
request_info=self.request_info,
Expand Down Expand Up @@ -223,7 +223,7 @@ def __init__(self, config):
self._loop = None
self.client_id = None
self.trace_configs = None
self.enable_cleanup_closed = None
self.enable_cleanup_closed = False
gbanasiak marked this conversation as resolved.
Show resolved Hide resolved
self._static_responses = None
self._request_class = aiohttp.ClientRequest
self._response_class = aiohttp.ClientResponse
Expand Down
2 changes: 1 addition & 1 deletion esrally/mechanic/launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def stop(self, nodes, metrics_store):
stop_watch.start()
try:
es.terminate()
es.wait(10.0)
es.wait(10)
stopped_nodes.append(node)
except psutil.NoSuchProcess:
self.logger.warning("No process found with PID [%s] for node [%s].", es.pid, node_name)
Expand Down
Loading
Loading