Skip to content

bpo-38319: Fix shutil._fastcopy_sendfile(): set sendfile() max block size #16491

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.

Sign up for GitHub

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

Merged
giampaolo merged 6 commits into from
Oct 1, 2019
Merged

bpo-38319: Fix shutil._fastcopy_sendfile(): set sendfile() max block size #16491

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d5fc0e9
set blocksize max 2G
giampaolo Sep 30, 2019
5ea0ee1
add news entry
giampaolo Sep 30, 2019
549e508
use power of 2; catch OSError
giampaolo Sep 30, 2019
49e6684
use binary prefixes
giampaolo Sep 30, 2019
222a267
only limit blocksize to 1GiB for 32 archs
giampaolo Sep 30, 2019
6614996
add comments
giampaolo Oct 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use power of 2; catch OSError
  • Loading branch information
@giampaolo
giampaolo committed Sep 30, 2019
commit 549e508c26776dd8193a2a64888ebacb11ef2208
4 changes: 2 additions & 2 deletions Lib/shutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ def _fastcopy_sendfile(fsrc, fdst):
# changes while being copied.
try:
blocksize = max(os.fstat(infd).st_size, 2 ** 23) # min 8MB
blocksize = min(blocksize, 2 ** 31 - 2) # max 2GB
except Exception:
blocksize = min(blocksize, 2 ** 30) # max 1GB
except OSError:
blocksize = 2 ** 27 # 128MB

offset = 0
Expand Down
2 changes: 1 addition & 1 deletion Lib/socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ def _sendfile_use_sendfile(self, file, offset=0, count=None):
if not fsize:
return 0 # empty file
blocksize = fsize if not count else count

@serhiy-storchaka serhiy-storchaka Sep 30, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
blocksize = fsize if not count else count
blocksize = count or fsize

blocksize = min(blocksize, 2 ** 31 - 2) # max 2GB
blocksize = min(blocksize, 2 ** 30) # max 1GB

timeout = self.gettimeout()
if timeout == 0:
Expand Down