Cleaned up possible concurrent modification in SidecarRetriever. #10316
+39
−33
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.
fixes #10288
Copying the maps does avoid the exception and short of some crazy locking is probably the cleanest solution to avoid the exception.
Documentation
doc-change-requiredlabel to this PR if updates are required.Changelog
Note
Low Risk
Low risk: change is limited to iterating over snapshots of
requeststo prevent concurrent modification during timeout checks/recovery state updates, with minimal behavioral impact beyond slightly extra allocations.Overview
Prevents a
ConcurrentModificationExceptioninSidecarRetriever.checkPendingRequests()by iterating over snapshots of therequestsmap (values and entry set) so callbacks can remove entries safely during iteration.Adds a changelog bugfix entry noting the concurrency fix.
Written by Cursor Bugbot for commit 6400d31. This will update automatically on new commits. Configure here.