Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions crates/cellule-store/docs/transport.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ sequenceDiagram
| Read admission | Reserve before backend work and release on completion/cancellation. |
| Observation | Count requests and bytes without changing ownership semantics. |

Observed GET, listing, and deletion streams remain finished after EOF, including
empty bodies. Polling them again returns `None` and records no second terminal
observation. Completion, provider errors, and cancellation each release the
active operation exactly once.

`StorageError` keeps its source where available. `RetryClass` separates
transient, throttled, state-dependent, and fatal failures. A caller controls
its own deadline and whether an ambiguous write can be retried.
Expand Down
12 changes: 8 additions & 4 deletions crates/cellule-store/src/observation/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ fn observe_get_stream(
stream: BoxStream<'static, object_store::Result<Bytes>>,
observation: ActiveObservation,
) -> BoxStream<'static, object_store::Result<Bytes>> {
Box::pin(futures_util::stream::unfold(
futures_util::stream::unfold(
(stream, Some(observation)),
|(mut stream, mut observation)| async move {
let active = observation.as_mut()?;
Expand All @@ -525,14 +525,16 @@ fn observe_get_stream(
}
}
},
))
)
.fuse()
.boxed()
}

fn observe_stream<T: Send + 'static>(
stream: BoxStream<'static, object_store::Result<T>>,
observation: ActiveObservation,
) -> BoxStream<'static, object_store::Result<T>> {
Box::pin(futures_util::stream::unfold(
futures_util::stream::unfold(
(stream, Some(observation)),
|(mut stream, mut observation)| async move {
let active = observation.as_mut()?;
Expand All @@ -548,7 +550,9 @@ fn observe_stream<T: Send + 'static>(
}
}
},
))
)
.fuse()
.boxed()
}

fn classify_error(error: &object_store::Error) -> StorageOutcome {
Expand Down
52 changes: 52 additions & 0 deletions crates/cellule-store/src/observation/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -363,3 +363,55 @@ fn provider_failures_use_bounded_outcomes() {
assert_eq!(classify_error(&forbidden), StorageOutcome::Auth);
assert_eq!(classify_error(&cancelled), StorageOutcome::Cancelled);
}

#[tokio::test]
async fn empty_observed_body_can_be_collected_through_get_result() {
let observer = Arc::new(RecordingObserver::default());
let erased: Arc<dyn StorageObserver> = observer.clone();
let provider = InMemory::new();
let path = Path::from("repository/empty");
provider
.put(&path, Bytes::new().into())
.await
.expect("put empty");
let mut result = provider.get(&path).await.expect("get metadata");
// S3 can expose a zero-chunk body. GetResult::bytes calls collect_bytes,
// which polls twice even when the first poll reaches EOF.
result.payload = GetResultPayload::Stream(observe_get_stream(
futures_util::stream::empty().boxed(),
ActiveObservation::new(StorageOperation::Get, &erased),
));
assert!(result.bytes().await.expect("collect empty body").is_empty());
assert_eq!(observer.active(StorageOperation::Get), 0);
let observations = observer.observations();
assert_eq!(observations.len(), 1);
assert_eq!(observations[0].outcome, StorageOutcome::Success);
assert_eq!(observations[0].bytes_read, 0);
}

#[tokio::test]
async fn observed_streams_remain_finished_after_repeated_eof_polls() {
let observer = Arc::new(RecordingObserver::default());
let erased: Arc<dyn StorageObserver> = observer.clone();
let mut body = observe_get_stream(
futures_util::stream::empty().boxed(),
ActiveObservation::new(StorageOperation::Get, &erased),
);
let mut listing = observe_stream::<Path>(
futures_util::stream::empty().boxed(),
ActiveObservation::new(StorageOperation::List, &erased),
);
for _ in 0..3 {
assert!(body.next().await.is_none());
assert!(listing.next().await.is_none());
}
assert_eq!(observer.active(StorageOperation::Get), 0);
assert_eq!(observer.active(StorageOperation::List), 0);
let observations = observer.observations();
assert_eq!(observations.len(), 2);
assert!(
observations
.iter()
.all(|entry| entry.outcome == StorageOutcome::Success)
);
}
Loading