(PUP-11853) Wait for request completion before closing #9084
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
|
Still needs a specific test, but I believe this is the right approach. |
joshcooper
reviewed
Jul 7, 2023
tvpartytonight
force-pushed
the
PUP-11853_close_after_request_done
branch
2 times, most recently
from
1f8df21
to
be707d5
Compare
Before this commit, puppet would attempt to `finish` a connection in the block passed to an `http.request` function. This will not work because `finish` sets the `@socket` to nil, and the net/http request assumes that the `@socket` is set for the duration of that function. With this change, we mark some state during the request function that indicates the connection should be closed after the completion of the `http.request`.
tvpartytonight
force-pushed
the
PUP-11853_close_after_request_done
branch
from
be707d5
to
7826d00
Compare
tvpartytonight
commented
Jul 10, 2023
| @@ -175,6 +175,22 @@ | |||
| end | |||
| end | |||
|
|
|||
| context 'ensure that retrying does not attempt to read the body after closing the connection' do | |||
There was a problem hiding this comment.
When running this test on 7.x, you can generate the original read body out of block error:
Puppet::HTTP::HTTPError:
Request to https://127.0.0.1:57572 failed after 1.01 seconds: attempt to read body out of block
# ./lib/puppet/http/client.rb:455:in `raise_error'
# ./lib/puppet/http/client.rb:166:in `rescue in connect'
# ./lib/puppet/http/client.rb:136:in `connect'
# ./lib/puppet/http/client.rb:366:in `execute_streaming'
# ./lib/puppet/http/client.rb:275:in `post'
# ./spec/integration/http/client_spec.rb:189:in `block (4 levels) in <top (required)>'
# ./spec/lib/puppet_spec/https.rb:81:in `block in start_server'
# ./spec/lib/puppet_spec/https.rb:41:in `pipe'
# ./spec/lib/puppet_spec/https.rb:41:in `start_server'
# ./spec/integration/http/client_spec.rb:186:in `block (3 levels) in <top (required)>'
# ./spec/spec_helper.rb:180:in `block (2 levels) in <top (required)>'
# ./vendor/bundle/ruby/2.7.0/gems/webmock-3.18.1/lib/webmock/rspec.rb:37:in `block (2 levels) in <top (required)>'
# ------------------
# --- Caused by: ---
# IOError:
# attempt to read body out of block
# ./lib/puppet/http/response_net_http.rb:18:in `body'
joshcooper
approved these changes
Jul 10, 2023
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.
Before this commit, puppet would attempt to
finisha connection in the block passed to anhttp.requestfunction. This will not work becausefinishsets the@socketto nil, and the net/http request assumes that the@socketis set for the duration of that function. With this change, we mark some state during the request function that indicates the connection should be closed after the completion of thehttp.request.