mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/store/bin): move service.clone right before async move

Browse source 
Change-Id: I7a2b951d9c9251a053a0de40f31836bda03a922d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10408
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Florian Klink 2023-12-22 14:25:41 +02:00 • committed by flokli
parent 39cddb95be
commit 93a228b9a4
1 changed files with 59 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tvix/store/src/bin/tvix-store.rs
View file

@ -260,11 +260,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let tasks = paths let tasks = paths
.into_iter() .into_iter()
.map(|path| { .map(|path| {
let task: JoinHandle<io::Result<()>> = tokio::task::spawn({
let blob_service = blob_service.clone(); let blob_service = blob_service.clone();
let directory_service = directory_service.clone(); let directory_service = directory_service.clone();
let path_info_service = path_info_service.clone(); let path_info_service = path_info_service.clone();
let task: JoinHandle<io::Result<()>> = tokio::task::spawn(async move { async move {
// Ingest the path into blob and directory service. // Ingest the path into blob and directory service.
let root_node = import::ingest_path( let root_node = import::ingest_path(
blob_service.clone(), blob_service.clone(),
@ -285,7 +286,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
.to_str() .to_str()
.expect("path must be valid unicode"); .expect("path must be valid unicode");
let output_path = store_path::build_nar_based_store_path(&nar_sha256, name); let output_path =
store_path::build_nar_based_store_path(&nar_sha256, name);
// assemble a new root_node with a name that is derived from the nar hash. // assemble a new root_node with a name that is derived from the nar hash.
let root_node = let root_node =
@ -305,7 +307,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
reference_names: vec![], reference_names: vec![],
deriver: None, deriver: None,
ca: Some(nar_info::Ca { ca: Some(nar_info::Ca {
r#type: tvix_store::proto::nar_info::ca::Hash::NarSha256.into(), r#type: tvix_store::proto::nar_info::ca::Hash::NarSha256
.into(),
digest: nar_sha256.to_vec().into(), digest: nar_sha256.to_vec().into(),
}), }),
}), }),
@ -327,6 +330,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
); );
Ok(()) Ok(())
}
}); });
task task
}) })