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

Reset the sock_read timeout when data arrives #4142

Merged
merged 3 commits into from
Oct 4, 2019
Merged

Reset the sock_read timeout when data arrives #4142

merged 3 commits into from
Oct 4, 2019

Conversation

mjpieters
Copy link
Contributor

What do these changes do?

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.

Related issue number

#3808

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES folder
    • name it <issue_id>.<type> for example (588.bugfix)
    • if you don't have an issue_id change it to the pr id after creating the pr
    • ensure type is one of the following:
      • .feature: Signifying a new feature.
      • .bugfix: Signifying a bug fix.
      • .doc: Signifying a documentation improvement.
      • .removal: Signifying a deprecation or removal of public API.
      • .misc: A ticket has been closed, but it is not of interest to users.
    • Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

Sorry, something went wrong.

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.
@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 #4142 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4142      +/-   ##
==========================================
+ Coverage   97.33%   97.33%   +<.01%     
==========================================
  Files          43       43              
  Lines        8849     8850       +1     
  Branches     1381     1381              
==========================================
+ Hits         8613     8614       +1     
  Misses        114      114              
  Partials      122      122
Impacted Files Coverage Δ
aiohttp/client_proto.py 96.66% <100%> (+0.02%) ⬆️

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 6efdefc...96e441a. Read the comment docs.

@asvetlov asvetlov merged commit ecb1b6b into aio-libs:master Oct 4, 2019
@asvetlov
Copy link
Member

asvetlov commented Oct 4, 2019

thanks!

asvetlov pushed a commit that referenced this pull request Oct 4, 2019
* 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]>
asvetlov added a commit that referenced this pull request Oct 7, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
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.


Co-authored-by: Martijn Pieters <[email protected]>
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.

None yet

3 participants