Skip to content

S3 part upload retries #25

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
amanda-ruby wants to merge 2 commits into
base: master
Choose a base branch
from
Open

S3 part upload retries #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ffd153
Add simple retries
amanda-ruby Apr 30, 2026
aaaf08b
Add retry logging
amanda-ruby Apr 30, 2026
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
20 changes: 18 additions & 2 deletions sendsafely/utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import json
import os
import secrets
import sys
import time

import requests
from .pgpy import PGPMessage, PGPKey
Expand Down Expand Up @@ -195,7 +197,21 @@ def _upload_file_part_to_s3(encrypted_file_part, url):
:param url: The S3 URL we're uploading to
:return: The JSON response from S3.
"""
return requests.put(url=url, data=encrypted_file_part)
max_attempts = 5
max_backoff_seconds = 180
for attempt in range(max_attempts):
try:
return requests.put(url=url, data=encrypted_file_part)
except (requests.exceptions.ConnectionError, requests.exceptions.Timeout,
requests.exceptions.ChunkedEncodingError) as e:
if attempt == max_attempts - 1:
raise
sleep_seconds = min(2 ** attempt, max_backoff_seconds)
sys.stdout.write(
'\nRetrying S3 part upload (attempt {0}/{1}) after {2}: sleeping {3}s\n'.format(
attempt + 2, max_attempts, type(e).__name__, sleep_seconds))
sys.stdout.flush()
time.sleep(sleep_seconds)


def _calculate_package_checksum(package_code, keycode):
Expand Down Expand Up @@ -333,4 +349,4 @@ def _make_safe_for_urlsafebase64(client_secret):
client_secret = client_secret.replace("=", "")
client_secret = client_secret.replace("+", "-")
client_secret = client_secret.replace("/", "_")
return client_secret
return client_secret