Fix defaultQueryTimeout#5807
Merged
jihoonson merged 4 commits intoapache:masterfrom Jun 8, 2018
Merged
Conversation
- set default timeout in query context before query fail time is evaluated Remove unused import
Contributor
|
Hi @awelsh93, could you please fill out the project CLA so we can accept this contribution? It's at: http://druid.io/community/cla.html |
gianm
reviewed
May 30, 2018
| DirectDruidClient.QUERY_FAIL_TIME, | ||
| startTimeMillis + QueryContexts.getTimeout(query) | ||
| ); | ||
| responseContext.put( |
Contributor
There was a problem hiding this comment.
What is going to add QUERY_TOTAL_BYTES_GATHERED now?
| { | ||
| this.serverConfig = serverConfig; | ||
| this.baseRunner = baseRunner; | ||
| this.startTimeMillis = startTimeMillis; |
Contributor
There was a problem hiding this comment.
This is always set to System.currentTimeMillis(), might as well set it in the constructor so callers don't have to pass that in. Unless you are intending to use the flexibility to write some unit tests -- in which case go for it.
| public Query<T> withTimeoutAndMaxScatterGatherBytes(Query<T> query, ServerConfig serverConfig) | ||
| { | ||
| return QueryContexts.verifyMaxQueryTimeout( | ||
| Query<T> new_query = QueryContexts.verifyMaxQueryTimeout( |
Contributor
There was a problem hiding this comment.
newQuery is more Druid-like spelling.
Contributor
Author
|
Hi @gianm, thank you for taking at look at this and leaving comments. I've addressed these comments and I have signed the CLA. |
jihoonson
reviewed
Jun 5, 2018
| */ | ||
| public static void removeMagicResponseContextFields(Map<String, Object> responseContext) | ||
| { | ||
| responseContext.remove(DirectDruidClient.QUERY_FAIL_TIME); |
Contributor
There was a problem hiding this comment.
This line should also be removed.
jihoonson
approved these changes
Jun 6, 2018
Contributor
|
It would be great if we can add a unit test for this bug, but not sure how to do it yet. |
leventov
pushed a commit
to metamx/druid
that referenced
this pull request
Jun 15, 2018
* Fix defaultQueryTimeout - set default timeout in query context before query fail time is evaluated Remove unused import * Address failing checks * Addressing code review comments * Removed line that was no longer used
jihoonson
pushed a commit
to jihoonson/druid
that referenced
this pull request
Jul 5, 2018
* Fix defaultQueryTimeout - set default timeout in query context before query fail time is evaluated Remove unused import * Address failing checks * Addressing code review comments * Removed line that was no longer used
fjy
pushed a commit
that referenced
this pull request
Jul 5, 2018
jihoonson
pushed a commit
to implydata/druid-public
that referenced
this pull request
Jul 6, 2018
* Fix defaultQueryTimeout - set default timeout in query context before query fail time is evaluated Remove unused import * Address failing checks * Addressing code review comments * Removed line that was no longer used
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
4 participants
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.
Fix for #5731
Made a change so that SetAndVerifyContextQueryRunner will set query fail time after the default query timeout is set in the query context.