@@ -105,14 +105,22 @@ pub async fn hydrate_for_read(
105105 ctx: &TenantContext,
106106 owner: &str,
107107 repo: &str,
108+ scratch_dir: &Path,
108109 max_pack_bytes: u64,
109110 max_repo_bytes: u64,
110111) -> Result<Option<HydratedRepo>, HydrateError> {
111112 let Some((_etag, _digest, manifest)) = load_pointer(store, ctx, owner, repo).await? else {
112113 return Ok(None);
113114 };
114115 Ok(Some(
115- materialize_manifest(store, &manifest, max_pack_bytes, max_repo_bytes).await?,
116+ materialize_manifest(
117+ store,
118+ &manifest,
119+ scratch_dir,
120+ max_pack_bytes,
121+ max_repo_bytes,
122+ )
123+ .await?,
116124 ))
117125}
118126
@@ -158,22 +166,29 @@ pub async fn hydrate_for_write(
158166 ctx: &TenantContext,
159167 owner: &str,
160168 repo: &str,
169+ scratch_dir: &Path,
161170 max_pack_bytes: u64,
162171 max_repo_bytes: u64,
163172) -> Result<(HydratedRepo, ParentState), HydrateError> {
164173 match load_pointer(store, ctx, owner, repo).await? {
165174 Some((etag, digest, manifest)) => {
166- let repo =
167- materialize_manifest(store, &manifest, max_pack_bytes, max_repo_bytes).await?;
175+ let repo = materialize_manifest(
176+ store,
177+ &manifest,
178+ scratch_dir,
179+ max_pack_bytes,
180+ max_repo_bytes,
181+ )
182+ .await?;
168183 let parent = ParentState::from_loaded(etag, digest, manifest);
169184 Ok((repo, parent))
170185 }
171186 None => {
172187 // First push: empty bare repo. No packs to fetch, no refs to
173188 // install. `receive-pack` will accept whatever the client
174189 // sends; `cas_publish` will use `If-None-Match: *`.
175- let tempdir =
176- TempDir::new() .map_err(|e| HydrateError::Hydrate(format!("tempdir: {e}")))?;
190+ let tempdir = TempDir::new_in(scratch_dir)
191+ .map_err(|e| HydrateError::Hydrate(format!("tempdir in {scratch_dir:?} : {e}")))?;
177192 let path = tempdir.path().to_path_buf();
178193 run_git(&path, &["init", "--bare", "--quiet"]).await?;
179194 Ok((
@@ -242,11 +257,13 @@ async fn get_verified_limited(
242257async fn materialize_manifest(
243258 store: &GitStore,
244259 manifest: &Manifest,
260+ scratch_dir: &Path,
245261 max_pack_bytes: u64,
246262 max_repo_bytes: u64,
247263) -> Result<HydratedRepo, HydrateError> {
248264 // Init bare repo.
249- let tempdir = TempDir::new().map_err(|e| HydrateError::Hydrate(format!("tempdir: {e}")))?;
265+ let tempdir = TempDir::new_in(scratch_dir)
266+ .map_err(|e| HydrateError::Hydrate(format!("tempdir in {scratch_dir:?}: {e}")))?;
250267 let path = tempdir.path().to_path_buf();
251268 run_git(&path, &["init", "--bare", "--quiet"]).await?;
252269
@@ -443,6 +460,26 @@ mod tests {
443460 )
444461 }
445462
463+ #[tokio::test]
464+ async fn materialized_repo_is_created_under_configured_scratch_dir() {
465+ let scratch = TempDir::new().unwrap();
466+ let store = GitStore::new("http://localhost:9000", "x", "x", "x", "us-east-1")
467+ .expect("construct store");
468+ let manifest = Manifest {
469+ version: 1,
470+ head: "refs/heads/main".into(),
471+ refs: BTreeMap::new(),
472+ packs: Vec::new(),
473+ parent: None,
474+ };
475+
476+ let hydrated = materialize_manifest(&store, &manifest, scratch.path(), u64::MAX, u64::MAX)
477+ .await
478+ .expect("materialize empty repo");
479+
480+ assert!(hydrated.path().starts_with(scratch.path()));
481+ }
482+
446483 // -------- Live MinIO + real git roundtrip ----------------------------------
447484 //
448485 // Run manually:
@@ -557,10 +594,12 @@ mod tests {
557594 }
558595
559596 // Hydrate.
560- let hydrated = hydrate_for_read(&st, &ctx, &owner, repo, u64::MAX, u64::MAX)
561- .await
562- .expect("hydrate")
563- .expect("hydrate Some");
597+ let scratch = TempDir::new().unwrap();
598+ let hydrated =
599+ hydrate_for_read(&st, &ctx, &owner, repo, scratch.path(), u64::MAX, u64::MAX)
600+ .await
601+ .expect("hydrate")
602+ .expect("hydrate Some");
564603 eprintln!("hydrated to {}", hydrated.path().display());
565604
566605 // The hydrated repo must list the same ref with the same oid.
@@ -630,9 +669,18 @@ mod tests {
630669 let st = store();
631670 let owner = format!("nope-{}", uuid::Uuid::new_v4());
632671 let ctx = tenant();
633- let result = hydrate_for_read(&st, &ctx, &owner, "ghost", u64::MAX, u64::MAX)
634- .await
635- .expect("ok");
672+ let scratch = TempDir::new().unwrap();
673+ let result = hydrate_for_read(
674+ &st,
675+ &ctx,
676+ &owner,
677+ "ghost",
678+ scratch.path(),
679+ u64::MAX,
680+ u64::MAX,
681+ )
682+ .await
683+ .expect("ok");
636684 assert!(result.is_none(), "missing pointer must surface as None");
637685 }
638686
@@ -677,10 +725,19 @@ mod tests {
677725 super::super::store::CasOutcome::LostRace => panic!("first INM* must win"),
678726 }
679727
680- let hydrated = hydrate_for_read(&st, &ctx, &owner, "void", u64::MAX, u64::MAX)
681- .await
682- .expect("hydrate")
683- .expect("hydrate Some");
728+ let scratch = TempDir::new().unwrap();
729+ let hydrated = hydrate_for_read(
730+ &st,
731+ &ctx,
732+ &owner,
733+ "void",
734+ scratch.path(),
735+ u64::MAX,
736+ u64::MAX,
737+ )
738+ .await
739+ .expect("hydrate")
740+ .expect("hydrate Some");
684741
685742 // HEAD points where the manifest said.
686743 let head_file = tokio::fs::read_to_string(hydrated.path().join("HEAD"))
0 commit comments