facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 00:45:18 +03:00
Code Issues Projects Releases Wiki Activity

mononoke: make hg sync job SYNC_ONCE async

Browse Source 
Reviewed By: farnz

Differential Revision: D25123103

fbshipit-source-id: 634287909a6be9e1b34160d63e27f14eabcdce95
This commit is contained in:
Stanislau Hlebik 2020-11-26 04:40:25 -08:00 committed by Facebook GitHub Bot
parent ed51aac36c
commit 2ca8bd5900
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
eden/mononoke/mononoke_hg_sync_job/src/main.rs
View File

@ -37,7 +37,7 @@ use futures_old::{
stream::Stream,
Future,
};
use futures_stats::{FutureStats, Timed};
use futures_stats::{futures03::TimedFutureExt, FutureStats, Timed};
use http::Uri;
use lfs_verifier::LfsVerifier;
use mercurial_types::HgChangesetId;
@ -844,33 +844,38 @@ async fn run(ctx: CoreContext, matches: ArgMatches<'static>) -> Result<(), Error
)
.await?;
if let Some(log_entry) = maybe_log_entry {
bundle_preparer
.prepare_single_bundle(ctx.clone(), log_entry.clone(), overlay.clone())
.and_then({
cloned!(ctx);
|prepared_log_entry| combine_entries(ctx, &[prepared_log_entry])
})
.and_then({
cloned!(ctx);
move |combined_entry| {
sync_single_combined_entry(
ctx.clone(),
combined_entry,
hg_repo,
base_retry_delay_ms,
retry_num,
globalrev_syncer,
)
}
})
.then(move |r| bind_sync_result(&[log_entry], r).into_future())
.collect_timing()
.map_err(|(stats, e)| (Some(stats), e))
.then(reporting_handler)
.then(build_outcome_handler(ctx.clone(), lock_via))
.map(|_| ())
let (stats, res) = async {
let prepared_log_entry = bundle_preparer
.prepare_single_bundle(ctx.clone(), log_entry.clone(), overlay.clone())
.compat()
.await?;
let combined_entry = combine_entries(ctx.clone(), &[prepared_log_entry])
.compat()
.await?;
sync_single_combined_entry(
ctx.clone(),
combined_entry,
hg_repo,
base_retry_delay_ms,
retry_num,
globalrev_syncer,
)
.compat()
.await
}
.timed()
.await;
let res = bind_sync_result(&[log_entry], res);
let res = match res {
Ok(ok) => Ok((stats, ok)),
Err(err) => Err((Some(stats), err)),
};
let res = reporting_handler(res).compat().await;
let res = build_outcome_handler(ctx, lock_via)(res);
let _ = res.compat().await?;
Ok(())
} else {
info!(ctx.logger(), "no log entries found");
Ok(())