Skip to content

Fix EOF retry bug that could cause data duplication when Range header is ignored #609

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
sarum90 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix EOF retry bug that could cause data duplication when Range header is ignored #609

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfc56c6
Do not retry if the full file has already been returned
sarum90 Jan 16, 2026
6e17d91
Add test for defensive check
sarum90 Jan 18, 2026
3581c5f
more elaborate tests
sarum90 Jan 19, 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
37 changes: 36 additions & 1 deletion src/client/get.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ use http_body_util::BodyExt;
use reqwest::header::ToStrError;
use std::ops::Range;
use std::sync::Arc;
use tracing::info;
use tracing::{info, warn};

/// A client that can perform a get request
#[async_trait]
Expand Down Expand Up @@ -215,6 +215,11 @@ impl<T: GetClient> GetContext<T> {
},
// Retry all response body errors
(Err(e), Some(etag)) if !ctx.retry_ctx.exhausted() => {
// Full range already read; can't form valid 0-byte Range, return EOF
if range.start >= range.end {
return Ok(None);
}

let sleep = ctx.retry_ctx.backoff();
info!(
"Encountered error while reading response body: {}. Retrying in {}s",
Expand All @@ -237,13 +242,43 @@ impl<T: GetClient> GetContext<T> {
.map_err(Self::err)?;

let (parts, retry_body) = request.into_parts();

// Verify we got a 206 Partial Content response
if parts.status != StatusCode::PARTIAL_CONTENT {
warn!(
"Retry request for range {:?} returned {} instead of 206 Partial Content",
range, parts.status
);
// Return the original error
return Err(Self::err(e));
}

let retry_etag = get_etag(&parts.headers).map_err(Self::err)?;

if etag != &retry_etag {
// Return the original error
return Err(Self::err(e));
}

// Verify Content-Range matches our request
if let Ok(content_range) = parse_range(&parts.headers) {
if content_range.range != range {
warn!(
"Retry request for range {:?} returned Content-Range {:?}",
range, content_range.range
);
// Return the original error
return Err(Self::err(e));
}
} else {
warn!(
"Retry request for range {:?} missing or invalid Content-Range header",
range
);
// Return the original error
return Err(Self::err(e));
}

body = retry_body;
}
(Err(e), _) => return Err(Self::err(e)),
Expand Down