You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
fix: close every retriever in MultiRetriever even when one raises - #13844
MultiRetriever.close() and close_async() run the cleanup of every owned retriever in a bare loop with no per-retriever isolation, so the first retriever whose close() raises (already-closed client, dropped connection, close timeout) aborts the loop and every later retriever is never closed - their resources leak while only the unrelated first error surfaces. close_async() has the same flaw on both its native path and its synchronous fallback.
before: close()/close_async() skip the healthy retriever after the first error
after : every retriever is closed; the first error is re-raised afterwards
Fix
Wrap each close in try/except BaseException, remember the first failure, finish closing the rest, then re-raise.
Tests
test/components/retrievers/test_multi_retriever.py (3 new tests: close, close_async, async sync-fallback):
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution. You have signed the CLA already but the status is still pending? Let us recheck it.
We noticed that the Contributor License Agreement (CLA) check (license/cla) hasn't passed yet, so we've temporarily moved this PR to draft and paused the review assignment.
To get your PR reviewed, please sign the CLA via the link in the license/cla check below (or in the CLA bot comment). As soon as the check turns green, this PR will automatically be marked ready for review again and a reviewer will be re-assigned.
Please note that PRs without a signed CLA are automatically closed 48 hours after they were opened.
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
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.
Problem
MultiRetriever.close()andclose_async()run the cleanup of every owned retriever in a bare loop with no per-retriever isolation, so the first retriever whoseclose()raises (already-closed client, dropped connection, close timeout) aborts the loop and every later retriever is never closed - their resources leak while only the unrelated first error surfaces.close_async()has the same flaw on both its native path and its synchronous fallback.Fix
Wrap each close in
try/except BaseException, remember the first failure, finish closing the rest, then re-raise.Tests
test/components/retrievers/test_multi_retriever.py(3 new tests:close,close_async, async sync-fallback):