summaryrefslogtreecommitdiffstats
path: root/src/orchestrator
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2020-12-08 13:23:46 +0100
committerMatthias Beyer <mail@beyermatthias.de>2020-12-08 13:29:26 +0100
commit4df090b2bd3887c384af55a05be2c4b8d25ffb6c (patch)
tree6fc5f32fc122b6f5f6a3e593383b01bd80fa993b /src/orchestrator
parent4be403e9eb7fdcb37a6083757c0c460e1d33cf82 (diff)
Make StagingStore get()able from MergedStores, to simplify Orchestrator impl
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'src/orchestrator')
-rw-r--r--src/orchestrator/orchestrator.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/orchestrator/orchestrator.rs b/src/orchestrator/orchestrator.rs
index e9a392e..40d6797 100644
--- a/src/orchestrator/orchestrator.rs
+++ b/src/orchestrator/orchestrator.rs
@@ -97,7 +97,7 @@ impl<'a> Orchestrator<'a> {
{
use tokio::stream::StreamExt;
- let merged_store = MergedStores::new(release_store.clone(), staging_store.clone());
+ let merged_store = MergedStores::new(release_store, staging_store);
let multibar = Arc::new(indicatif::MultiProgress::new());
let results = jobset // run the jobs in the set
.into_runables(&merged_store, source_cache, config)
@@ -136,7 +136,7 @@ impl<'a> Orchestrator<'a> {
}
{ // check if all paths that were written are actually there in the staging store
- let staging_store_lock = staging_store.read().await;
+ let staging_store_lock = merged_store.staging().read().await;
trace!("Checking {} results...", results.len());
for artifact in results.iter() {