Phase 5k: parallel-fanout chunk transfer for prewarm

Pilot 2026-07-12 measured 109 MiB/s on the sequential prewarm path —
~11% of a 10G fabric. `quinn::Connection` is cheap-Clone (internal
Arc), so we can run the has→get→put pipeline per chunk in concurrent
tasks under a bounded semaphore.

- `prewarm_missing_chunks_between_parallel(up, down, id, concurrency)`
  in `rpc/client.rs`. `concurrency <= 1` degrades to the sequential
  path (kept for diagnostic parity).
- `claw-cargo prewarm --parallel N` (default 8). Ignored with
  `--buffered`. Memory ceiling: 4 MiB × in-flight = 32 MiB @ 8,
  128 MiB @ 32.
- Uses `tokio::task::JoinSet` + `Arc<Semaphore>`; permit held for
  the whole per-chunk pipeline so we never over-commit.
- Retry pass on `put_manifest` mismatch stays sequential — small,
  correctness-critical.
- Errors: JoinSet drains completely + returns first task error so a
  mid-fanout failure doesn't leave zombie tasks.

+1 test: `end_to_end_parallel_prewarm_copies_chunks_and_matches_sequential`
runs 5-chunk payload with concurrency=3, verifies byte-equal restore,
then reruns with concurrency=8 → 0 uploads (has_chunk dedup), then
concurrency=0 → 0 uploads (sequential fallback path).

254 tests pass (+1 from previous). Pre-existing macOS failure unchanged.
This commit is contained in:
Omar Sobh
2026-07-12 06:13:28 -07:00
parent a8fac47470
commit 54e9da4d62
3 changed files with 236 additions and 13 deletions
+103
View File
@@ -676,3 +676,106 @@ pub async fn prewarm_missing_chunks_between(
}
Ok((uploaded, total))
}
/// Phase 5k: parallel-fanout variant of [`prewarm_missing_chunks_between`].
///
/// Runs the has→get→put pipeline for each chunk concurrently, bounded
/// by `concurrency`. Pilot 2026-07-12 measured **109 MiB/s** on the
/// sequential path — ~11% of a 10G link. Parallelism pushes toward
/// the link cap; on the same clawverse workload (249 chunks) we
/// expect a several-× speedup with `concurrency = 8`.
///
/// `concurrency = 0` or `1` degrades to the sequential path.
///
/// Memory: one 4 MiB chunk buffer × in-flight requests. `concurrency
/// = 8` → 32 MiB peak; `concurrency = 32` → 128 MiB.
///
/// `quinn::Connection` is `Clone` (internal `Arc`) so we can share it
/// across the spawned tasks without wrapping in an outer Arc.
pub async fn prewarm_missing_chunks_between_parallel(
upstream: &Connection,
downstream: &Connection,
id: &BlobId,
concurrency: usize,
) -> Result<(usize, usize)> {
// Fall through to the sequential path when parallelism disabled.
if concurrency <= 1 {
return prewarm_missing_chunks_between(upstream, downstream, id).await;
}
let manifest = call_blob_load_manifest(upstream, id)
.await?
.with_context(|| format!("upstream missing blob {}", id.to_hex()))?;
let total = manifest.chunks.len();
let sem = std::sync::Arc::new(tokio::sync::Semaphore::new(concurrency));
let mut set = tokio::task::JoinSet::new();
for hash in manifest.chunks.iter().copied() {
let permit = sem
.clone()
.acquire_owned()
.await
.context("acquiring prewarm semaphore permit")?;
let up = upstream.clone();
let down = downstream.clone();
set.spawn(async move {
// Permit held for the whole pipeline — released on drop.
let _permit = permit;
if call_has_chunk(&down, &hash).await? {
return Ok::<bool, anyhow::Error>(false);
}
let bytes = call_get_chunk(&up, &hash).await?.with_context(|| {
format!(
"upstream manifest referenced chunk {} but GetChunk returned NotFound",
hash.to_hex()
)
})?;
call_put_chunk(&down, &hash, &bytes).await?;
Ok(true)
});
}
let mut uploaded = 0usize;
let mut first_err: Option<anyhow::Error> = None;
while let Some(join) = set.join_next().await {
match join {
Ok(Ok(pushed)) => {
if pushed {
uploaded += 1;
}
}
Ok(Err(e)) => {
if first_err.is_none() {
first_err = Some(e);
}
}
Err(join_err) => {
if first_err.is_none() {
first_err = Some(anyhow::Error::from(join_err));
}
}
}
}
if let Some(e) = first_err {
return Err(e).context("prewarm chunk task failed");
}
// Commit + one retry pass — same shape as the sequential variant.
let still_missing = call_put_manifest(downstream, &manifest).await?;
if !still_missing.is_empty() {
for hash in &still_missing {
let bytes = call_get_chunk(upstream, hash)
.await?
.with_context(|| format!("retry fetch of chunk {} failed", hash.to_hex()))?;
call_put_chunk(downstream, hash, &bytes).await?;
uploaded += 1;
}
let final_missing = call_put_manifest(downstream, &manifest).await?;
if !final_missing.is_empty() {
bail!(
"downstream still missing {} chunks after retry; storage may be failing",
final_missing.len()
);
}
}
Ok((uploaded, total))
}
@@ -1105,3 +1105,102 @@ async fn streaming_prewarm_skips_chunks_already_present_downstream() {
acc_a.abort();
acc_c.abort();
}
#[tokio::test]
async fn end_to_end_parallel_prewarm_copies_chunks_and_matches_sequential() {
// Phase 5k: parallel prewarm variant produces the same downstream
// state as the sequential path. Also proves the JoinSet fanout
// doesn't lose or duplicate chunks.
use crate::cluster::blob::CHUNK_SIZE;
let (id_a, id_b_for_a) = NodeIdentity::generate_test_pair("a", "b_a").unwrap();
let (id_c, id_b_for_c) = NodeIdentity::generate_test_pair("c", "b_c").unwrap();
let (_tmp_a, router_a) = router_with_full_stack("a", next_port()).await;
let (_tmp_c, router_c) = router_with_full_stack("c", next_port()).await;
// 5 chunks so parallelism (concurrency=3) actually queues work.
let payload: Vec<u8> = (0..(4 * CHUNK_SIZE + CHUNK_SIZE / 3))
.map(|i| ((i * 7) % 251) as u8)
.collect();
let blob_id = router_a
.blob_store()
.unwrap()
.put_bytes(&payload)
.await
.unwrap();
let manifest = router_a
.blob_store()
.unwrap()
.load_manifest(&blob_id)
.await
.unwrap()
.unwrap();
assert_eq!(manifest.chunks.len(), 5, "expected 5 chunks in payload");
let server_a = QuicServer::bind(loopback(0), id_a).unwrap();
let addr_a = server_a.local_addr().unwrap();
let ra = router_a.clone();
let acc_a = tokio::spawn(async move {
while let Some(Ok(conn)) = server_a.accept().await {
let r = ra.clone();
tokio::spawn(async move {
let _ = serve_connection(conn, r).await;
});
}
});
let server_c = QuicServer::bind(loopback(0), id_c).unwrap();
let addr_c = server_c.local_addr().unwrap();
let rc = router_c.clone();
let acc_c = tokio::spawn(async move {
while let Some(Ok(conn)) = server_c.accept().await {
let r = rc.clone();
tokio::spawn(async move {
let _ = serve_connection(conn, r).await;
});
}
});
let up_client = QuicClient::new(loopback(0), id_b_for_a).unwrap();
let up_conn = up_client.connect(addr_a, "a").await.unwrap();
let down_client = QuicClient::new(loopback(0), id_b_for_c).unwrap();
let down_conn = down_client.connect(addr_c, "c").await.unwrap();
let (uploaded, total) =
prewarm_missing_chunks_between_parallel(&up_conn, &down_conn, &blob_id, 3)
.await
.unwrap();
assert_eq!(total, 5);
assert_eq!(uploaded, 5, "cold downstream must receive every chunk");
// Round-trip proves manifest committed AND chunks landed.
let round = router_c
.blob_store()
.unwrap()
.get_bytes(&blob_id)
.await
.unwrap();
assert_eq!(round.as_deref(), Some(payload.as_slice()));
// Idempotency: re-running with concurrency=8 uploads 0 (full dedup).
let (uploaded2, _) =
prewarm_missing_chunks_between_parallel(&up_conn, &down_conn, &blob_id, 8)
.await
.unwrap();
assert_eq!(uploaded2, 0, "re-run should be a no-op via has_chunk dedup");
// concurrency=0 falls through to sequential.
let (uploaded3, _) =
prewarm_missing_chunks_between_parallel(&up_conn, &down_conn, &blob_id, 0)
.await
.unwrap();
assert_eq!(uploaded3, 0, "sequential fallback should also see full dedup");
up_conn.close(quinn::VarInt::from_u32(0), b"done");
down_conn.close(quinn::VarInt::from_u32(0), b"done");
up_client.shutdown().await;
down_client.shutdown().await;
tokio::time::sleep(Duration::from_millis(50)).await;
acc_a.abort();
acc_c.abort();
}