ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

nix: Another deployment parallelization oops

Browse source
This commit is contained in:
Zhaofeng Li 2021-12-03 00:06:17 -08:00
parent 2bba64a002
commit a3e292d7fb
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nix/deployment/mod.rs
View file

@ -329,17 +329,16 @@ impl Deployment {
let nodes = vec![target.name.clone()]; let nodes = vec![target.name.clone()];
let permit = self.parallelism_limit.apply.acquire().await.unwrap();
let push_job = parent.create_job(JobType::Push, nodes.clone())?; let push_job = parent.create_job(JobType::Push, nodes.clone())?;
let push_profile = profile.clone(); let push_profile = profile.clone();
let arc_self = self.clone(); let arc_self = self.clone();
let mut target = push_job.run_waiting(|job| async move { let mut target = push_job.run(|job| async move {
if target.host.is_none() { if target.host.is_none() {
return Err(NixError::Unsupported); return Err(NixError::Unsupported);
} }
let permit = arc_self.parallelism_limit.apply.acquire().await.unwrap();
job.state(JobState::Running)?;
let host = target.host.as_mut().unwrap(); let host = target.host.as_mut().unwrap();
host.set_job(Some(job.clone())); host.set_job(Some(job.clone()));
host.copy_closure( host.copy_closure(
@ -347,7 +346,6 @@ impl Deployment {
CopyDirection::ToRemote, CopyDirection::ToRemote,
arc_self.options.to_copy_options()).await?; arc_self.options.to_copy_options()).await?;
drop(permit);
Ok(target) Ok(target)
}).await?; }).await?;
@ -441,6 +439,8 @@ impl Deployment {
}).await?; }).await?;
} }
drop(permit);
Ok(()) Ok(())
} }
} }