Add timeout for http.send builtin
#2105
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
patrick-east
force-pushed
the
issue/2099
branch
3 times, most recently
from
8cba6bd to
89f39ef
Compare
There is a new optional `timeout` option to specify with `http.send` which will set a client timeout on the request. This will override the default 5 second timeout. This change also corrects the request to use the builtin context. This means that if the evaluation is canceled the request will also now be canceled. There is an environment variable for adjusting the default timeout which we should aim to remove in future OPA versions (when appropriate). For now though it is still supported, and will panic if supplied with an invalid value rather than previously ignoring it and effectively disable the timeout (0 == unlimited). Fixes: open-policy-agent#2099 Signed-off-by: Patrick East <east.patrick@gmail.com>
patrick-east
force-pushed
the
issue/2099
branch
from
89f39ef to
7b19c10
Compare
tsandall
approved these changes
Feb 17, 2020
Comment on lines
+278
to
+281
| if !enableRedirect { | ||
| client.CheckRedirect = func(*http.Request, []*http.Request) error { | ||
| return http.ErrUseLastResponse | ||
| } |
There was a problem hiding this comment.
Is this an important fix? What was happening before? Maybe a comment would be useful for our future selves.
There was a problem hiding this comment.
Nothing changed with the behavior, its just a refactor with how the client is being created. It used to set this explicitly on the client creation and then nil it out if redirects are enabled. Now we don't set it when creating the client and just update it as needed (when redirects are disabled).
Comment on lines
+244
to
+246
| client := &http.Client{ | ||
| Timeout: timeout, | ||
| } |
There was a problem hiding this comment.
👌 this should cover the end to end timeout from dial to response body received. nice!
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.
There is a new optional
timeoutoption to specify withhttp.sendwhich will set a client timeout on the request. This will override the
default 5 second timeout.
This change also corrects the request to use the builtin context. This
means that if the evaluation is canceled the request will also now be
canceled.
There is an environment variable for adjusting the default timeout
which we should aim to remove in future OPA versions (when
appropriate). For now though it is still supported, and will panic if
supplied with an invalid value rather than previously ignoring it and
effectively disable the timeout (0 == unlimited).
Fixes: #2099
Signed-off-by: Patrick East east.patrick@gmail.com