fix: single-flight Discovery Engine mode detection#6106
Open
he-yufeng wants to merge 1 commit into
Open
Conversation
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.
Please ensure you have read the contribution guide before creating a pull request.
Link to Issue or Description of Change
1. Link to an existing issue (if applicable):
Problem:
DiscoveryEngineSearchTool(search_result_mode=None)auto-detects the result mode by tryingCHUNKSfirst and falling back toDOCUMENTSwhen Discovery Engine reports a structured datastore. On a fresh shared tool instance, concurrent first calls can all enter that probe path before_search_result_modeis cached, so a structured datastore pays one failingCHUNKSrequest per concurrent caller.Solution:
Make the auto-detect probe single-flight per tool instance. The first cold caller detects the datastore mode and caches it; concurrent callers re-check the cached mode after the lock and go straight to the detected mode. The successful
CHUNKScase is cached too, since the result mode is a datastore property rather than a query property.Testing Plan
Unit Tests:
Passed locally:
Additional checks:
Manual End-to-End (E2E) Tests:
Not run. The regression test uses a fake Discovery Engine client to reproduce the concurrent cold-start behavior without live Discovery Engine quota or billing.
Checklist
Additional context
The new test starts multiple threads against one fresh tool instance. The fake client delays and rejects the
CHUNKSprobe with the structured-datastore error, then succeeds inDOCUMENTSmode. The fixed behavior performs oneCHUNKSprobe total and oneDOCUMENTSrequest per caller.