Skip to content

Use wait_for_completion:False instead of relying on timeouts in ForceMerge #2016

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.

Sign up for GitHub

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

Merged
gareth-ellis merged 4 commits into from
Dec 18, 2025
Merged

Use wait_for_completion:False instead of relying on timeouts in ForceMerge #2016

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59fcf91
Use wait_for_completion:False instead of relying on timeouts
gareth-ellis Dec 15, 2025
505d494
Retain old behaviour if < 8.1
gareth-ellis Dec 15, 2025
ca4e746
Update tests to cover new behaviour
gareth-ellis Dec 15, 2025
3d03646
Add ability to trace via task_id if present. Update tests
gareth-ellis Dec 18, 2025
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
16 changes: 11 additions & 5 deletions esrally/driver/runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,12 +709,18 @@ async def __call__(self, es, params):
if max_num_segments:
merge_params["max_num_segments"] = max_num_segments
if mode == "polling":
complete = False
try:
es_info = await es.info()
es_version = Version.from_string(es_info["version"]["number"])
if es_version < Version(8, 1, 0):
try:
await es.indices.forcemerge(**merge_params)
complete = True
except elasticsearch.ConnectionTimeout:
pass
else:
complete = False
merge_params["wait_for_completion"] = False
await es.indices.forcemerge(**merge_params)
complete = True
except elasticsearch.ConnectionTimeout:
pass
while not complete:
await asyncio.sleep(params.get("poll-period"))
tasks = await es.tasks.list(params={"actions": "indices:admin/forcemerge"})
Expand Down
Loading