add defaultKillQueryDeadline #87
Merged
Conversation
This file contains 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
vano144
force-pushed
the
feature/add-kill-on-query-timeout-constant
branch
4 times, most recently
from
89a8f0b
to
e5bab72
Compare
vano144
force-pushed
the
feature/add-kill-on-query-timeout-constant
branch
from
e5bab72
to
481774d
Compare
vano144
force-pushed
the
feature/add-kill-on-query-timeout-constant
branch
from
481774d
to
3839fc1
Compare
DoubleDi
reviewed
Dec 4, 2019
conn.go
Outdated
| @@ -36,6 +36,8 @@ var ( | |||
| errEmptyQueryID = errors.New("query id is empty") | |||
| ) | |||
|
|
|||
| var defaultKillQueryDeadline = time.Duration(time.Second) | |||
There was a problem hiding this comment.
lets rename to defaultKillQueryTimeout because its actually a timeout, not a deadline
conn.go
Outdated
| @@ -192,7 +196,11 @@ func (c *conn) killQuery(req *http.Request, args []driver.Value) error { | |||
| return errEmptyQueryID | |||
| } | |||
| query := fmt.Sprintf("KILL QUERY WHERE query_id='%s'", queryID) | |||
| ctx, cancelFunc := context.WithTimeout(context.Background(), c.transport.ResponseHeaderTimeout) | |||
| limit := c.killQueryTimeout | |||
There was a problem hiding this comment.
lets rename limit to timeout
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.
This pr fixes next problem: when killQuery option is enabled and readTimeout is equal to zero, context will have 0 limit as timeout