Skip to content

Handle another case of incomplete reads from S3-type storage (OVH S3) #216

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
edward-evans-aiven merged 2 commits into from
Dec 10, 2025
Merged

Handle another case of incomplete reads from S3-type storage (OVH S3) #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bbbc44
Handle another case of incomplete reads from S3-type storage (OVH S3)
bridgetb Dec 9, 2025
144701f
disregard autogenerated file when linting
nicois Dec 10, 2025
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
2 changes: 2 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ docs = [
[tool.ruff]
target-version = "py38"
line-length = 125
extend-exclude = ["rohmu/version.py"]


[tool.ruff.lint]
extend-select = [
Expand Down
6 changes: 5 additions & 1 deletion rohmu/object_storage/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,11 @@ def _read_object_to_fileobj(
read_amount = min(read_amount, READ_BLOCK_SIZE)
try:
data = streaming_body.read(amt=read_amount)
except (botocore.exceptions.IncompleteReadError, botocore.exceptions.ReadTimeoutError) as ex:
except (
botocore.exceptions.IncompleteReadError,
botocore.exceptions.ReadTimeoutError,
botocore.exceptions.ResponseStreamingError,
) as ex:
raise MaybeRecoverableError("botocore.exceptions.IncompleteReadError", position=data_read) from ex

fileobj.write(data)
Expand Down
6 changes: 5 additions & 1 deletion test/object_storage/test_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,10 @@ def test_get_contents_to_fileobj_raises_error_on_invalid_byte_range(infra: S3Inf
[
botocore.exceptions.IncompleteReadError(actual_bytes=80, expected_bytes=200),
botocore.exceptions.ReadTimeoutError(endpoint_url="https://example.org"),
botocore.exceptions.ResponseStreamingError(
endpoint_url="https://example.org",
error="An error occurred while reading from response stream: ...",
),
],
ids=type,
)
Expand Down Expand Up @@ -424,7 +428,7 @@ class TransferMinMultipartChunkSizeTestData:
expected_chunk_size=mb_to_bytes(9),
),
TransferMinMultipartChunkSizeTestData(
description="Same as above, but min_multipart_chunk_size is set to 50 MB, " "we expect only 2 chunks of 50 MB each",
description="Same as above, but min_multipart_chunk_size is set to 50 MB, we expect only 2 chunks of 50 MB each",
size=mb_to_bytes(100),
segment_size=mb_to_bytes(9),
min_multipart_chunk_size=mb_to_bytes(50),
Expand Down