Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.6] Reset the sock_read timeout when data arrives (#4142) #4143

Merged
merged 1 commit into from
Oct 7, 2019

Conversation

asvetlov
Copy link
Member

@asvetlov asvetlov commented Oct 4, 2019

The sock_read timeout should apply per read operation, but currently applies
cumulatively across all reads. Reschedule the timeout each time data is
received and add tests to validate that the timeout doesn't interfere with
overall reading and correctly catches reads that take too long.
(cherry picked from commit ecb1b6b)

Co-authored-by: Martijn Pieters [email protected]

* Reset the sock_read timeout when data arrives

The sock_read timeout should apply *per read operation*, but currently applies
cumulatively across all reads. Reschedule the timeout each time data is
received and add tests to validate that the timeout doesn't interfere with
overall reading and correctly catches reads that take too long.

* Add myself to the contributors list

* Add a towncrier change description
(cherry picked from commit ecb1b6b)

Co-authored-by: Martijn Pieters <[email protected]>
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Oct 4, 2019
@codecov-io
Copy link

codecov-io commented Oct 4, 2019

Codecov Report

Merging #4143 into 3.6 will decrease coverage by 0.04%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff            @@
##             3.6    #4143      +/-   ##
=========================================
- Coverage   98.1%   98.06%   -0.05%     
=========================================
  Files         44       44              
  Lines       8871     8872       +1     
  Branches    1391     1391              
=========================================
- Hits        8703     8700       -3     
- Misses        63       66       +3     
- Partials     105      106       +1
Impacted Files Coverage Δ
aiohttp/client_proto.py 96.57% <100%> (+0.02%) ⬆️
aiohttp/web_fileresponse.py 96.59% <0%> (-1.14%) ⬇️
aiohttp/connector.py 97.43% <0%> (-0.33%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d361272...ecc99de. Read the comment docs.

@asvetlov asvetlov merged commit 53f0eeb into 3.6 Oct 7, 2019
@asvetlov asvetlov deleted the backport-ecb1b6b-3.6 branch October 7, 2019 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants