From 4df090b2bd3887c384af55a05be2c4b8d25ffb6c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 8 Dec 2020 13:23:46 +0100 Subject: Make StagingStore get()able from MergedStores, to simplify Orchestrator impl Signed-off-by: Matthias Beyer --- src/orchestrator/orchestrator.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/orchestrator/orchestrator.rs') 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() { -- cgit v1.2.3