Skip to content

EN-3146 Fix S3 upload retry #16

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

Open
stepan-mt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

EN-3146 Fix S3 upload retry #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 1 addition & 15 deletions src/maptiler/cloud_cli/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import io
import re
from dataclasses import dataclass
from operator import attrgetter
Expand Down Expand Up @@ -262,23 +261,10 @@ def ingest_datasets(
def upload_to_s3(file: Path, upload: S3Upload) -> S3UploadResult:
from urllib3.util.retry import Retry

# The requests library does not work with body iterator.
http = urllib3.PoolManager(retries=Retry(total=5, backoff_factor=0.5))

parts = []
file_size = file.stat().st_size
buffer = memoryview(bytearray(8 * 1024 * 1024))

def read(length: int):
while length > 0:
if length >= len(buffer):
target = buffer
else:
target = buffer[:length]

num_read = fp.readinto(target)
yield target[:num_read]
length -= num_read

with file.open("rb") as fp:
for part in sorted(upload.parts, key=attrgetter("part_id")):
Expand All @@ -292,7 +278,7 @@ def read(length: int):
method="PUT",
url=part.url,
headers={"Content-Length": str(length)},
body=read(length),
body=fp.read(length),
)
if response.status >= 400:
raise RuntimeError(response.status, response.read())
Expand Down