fix: handle unstructured upstream query error responses#19427
Open
mike-lmctl wants to merge 1 commit intoapache:masterfrom
Open
fix: handle unstructured upstream query error responses#19427mike-lmctl wants to merge 1 commit intoapache:masterfrom
mike-lmctl wants to merge 1 commit intoapache:masterfrom
Conversation
Upstream overload and proxy error paths can return HTML bodies for HTTP error statuses. Convert those unstructured error bodies into query exceptions before the JSON parser sees the stream, while keeping structured JSON and Smile error responses on the existing path. Tested: mvn -pl server -am -Dtest=DirectDruidClientTest -Dsurefire.failIfNoSpecifiedTests=false test -DskipITs
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.
Fixes #19407.
Description
This updates
DirectDruidClientso HTTP error responses with unstructured bodies, such as Jetty HTML 429/503 pages, are converted into Druid query exceptions before the response stream reaches the JSON parser.Structured JSON/Smile error responses still use the existing parsing path. For unstructured 429/503 responses, the client now reports a query capacity error since those statuses indicate upstream rate limiting or overload. If
Content-Typeis missing, the response body is sniffed so JSON-looking error bodies still take the existing path.Release note
Broker query failures caused by upstream 429/503 HTML error responses now surface as query capacity errors instead of raw JSON parse errors.
Key changed/added classes in this PR
DirectDruidClientDirectDruidClientTestThis PR has:
Tested with:
mvn -pl server -am -Dtest=DirectDruidClientTest -Dsurefire.failIfNoSpecifiedTests=false test -DskipITsResult: 13 tests passed.