Fix batch rate-limit scheduling for partial batches - #2132
Open
hugosmoreira wants to merge 1 commit into
Open
Conversation
Calculate the next batch delay from the number of objects actually sent, preserve retry backoff timestamps, and cover full, partial, elapsed, retry, and empty-batch cases.
There was a problem hiding this comment.
Orca Security Scan Summary
| Status | Check | Issues by priority | |
|---|---|---|---|
| Infrastructure as Code | View in Orca | ||
| SAST | View in Orca | ||
| Secrets | View in Orca | ||
| Vulnerabilities | View in Orca |
|
To avoid any confusion in the future about your contribution to Weaviate, we work with a Contributor License Agreement. If you agree, you can simply add a comment to this PR that you agree with the CLA so that we can merge. |
Author
|
I have read and agree to the Weaviate Contributor License Agreement. |
hugosmoreira
marked this pull request as ready for review
August 12, 2026 05:29
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Root cause
Rate-limited batching used a fixed interval derived from the configured concurrency. A partial batch therefore incurred the same delay as a full batch, which unnecessarily reduced throughput. The request timestamp was also recorded before the scheduler's batch-filling wait.
The new interval is proportional to the previous batch's actual object count:
base_time * objects_sent / requests_per_minuteFull batches retain their existing spacing, while partial batches can proceed sooner without exceeding the configured object rate.
Validation
pytest test/collection/test_batch.py -q— 16 passedpytest test --ignore=test/test_timeout.py -q— 414 passed, 1 skippedpytest mock_tests -q— 56 passedruff check weaviate test mock_tests integration— passedruff format --check weaviate test mock_tests integration— passedflake8 weaviate test mock_tests integration— passedpyright weaviate/collections/batch/base.py— passedtwine check— passedpytest integration/test_batch_v4.py::test_add_objects_in_multiple_batches -vvagainst Weaviate 1.39.0 — passedTwo async-indexing integration cases could not run locally because Windows reserves the repository's configured host port 50061. Two unrelated subprocess timeout-harness tests were excluded locally because Windows xdist termination does not forward their expected stderr text; the remaining unit suite passed.
Fixes #1100