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

mononoke/repo_client: log when hooks finished (and how many were rejected)

Browse Source 
Summary:
This updates repo_client to log when hooks finished, and how many were rejecte,
if any. This required a bit of refactoring to avoid iterating twice over
whether hooks are rejected or not (and instead just filter-maps outcomes to a
rejection), but it's probably for the better since it removes a bit of
un-necessary cloning (notably of the hook name).

Reviewed By: farnz

Differential Revision: D21379690

fbshipit-source-id: 53c8368d3871620ec61db76dc35b47dd17276ac4
This commit is contained in:
Thomas Orozco 2020-05-04 09:53:11 -07:00 committed by Facebook GitHub Bot
parent 367db1d20a
commit 6df567f7ca
2 changed files with 58 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
eden/mononoke/hooks/src/lib.rs
View File

@ -424,6 +424,25 @@ impl HookOutcome {
HookOutcome::FileHook(_, exec) => exec,
}
}
pub fn into_rejection(self) -> Option<(String, ChangesetId, HookRejectionInfo)> {
match self {
HookOutcome::ChangesetHook(_, HookExecution::Accepted)
| HookOutcome::FileHook(_, HookExecution::Accepted) => None,
HookOutcome::ChangesetHook(
ChangesetHookExecutionID { cs_id, hook_name },
HookExecution::Rejected(reason),
)
| HookOutcome::FileHook(
FileHookExecutionID {
cs_id,
hook_name,
path: _,
},
HookExecution::Rejected(reason),
) => Some((hook_name, cs_id, reason)),
}
}
}
#[derive(Clone, Debug, PartialEq)]

71
eden/mononoke/repo_client/unbundle/src/hook_running.rs
View File

@ -8,6 +8,7 @@
#![deny(warnings)]
use crate::{resolver::HookFailure, BundleResolverError, PostResolveAction, PostResolvePushRebase};
use anyhow::Context;
use blobrepo::BlobRepo;
use bookmarks::BookmarkName;
use bytes::Bytes;
@ -15,8 +16,10 @@ use context::CoreContext;
use futures::{compat::Future01CompatExt, stream::TryStreamExt, FutureExt, TryFutureExt};
use futures_ext::{BoxFuture, FutureExt as _};
use futures_old::future::ok;
use hooks::{HookExecution, HookManager, HookOutcome};
use futures_stats::TimedFutureExt;
use hooks::{HookManager, HookOutcome};
use mononoke_types::BonsaiChangeset;
use scuba_ext::ScubaSampleBuilderExt;
use std::{collections::HashMap, sync::Arc};
pub fn run_hooks(
@ -73,40 +76,44 @@ async fn run_hooks_on_changesets(
bookmark: BookmarkName,
maybe_pushvars: Option<HashMap<String, Bytes>>,
) -> Result<(), BundleResolverError> {
let hook_outcomes = hook_manager
let (stats, hook_outcomes) = hook_manager
.run_hooks_for_bookmark(&ctx, changesets, &bookmark, maybe_pushvars.as_ref())
.await?;
if hook_outcomes.iter().all(HookOutcome::is_accept) {
Ok(())
} else {
let hook_failures = hook_outcomes
.into_iter()
.filter_map(|outcome| {
let hook_name = outcome.get_hook_name().to_string();
.timed()
.await;
let hook_outcomes = hook_outcomes.context("While running hooks")?;
let cs_id = outcome.get_changeset_id();
let rejections = hook_outcomes
.into_iter()
.filter_map(HookOutcome::into_rejection)
.collect::<Vec<_>>();
let info = match outcome.into() {
HookExecution::Accepted => None,
HookExecution::Rejected(info) => Some(info),
}?;
ctx.scuba()
.clone()
.add_future_stats(&stats)
.add("hook_rejections", rejections.len())
.log_with_msg("Executed hooks", None);
Some(async move {
let cs_id = repo
.get_hg_from_bonsai_changeset(ctx.clone(), cs_id)
.compat()
.await?;
Result::<_, anyhow::Error>::Ok(HookFailure {
hook_name,
cs_id,
info,
})
})
})
.collect::<futures::stream::FuturesUnordered<_>>()
.try_collect()
.await?;
Err(BundleResolverError::HookError(hook_failures))
if rejections.is_empty() {
return Ok(());
}
let rejections = rejections
.into_iter()
.map(|(hook_name, cs_id, info)| async move {
let cs_id = repo
.get_hg_from_bonsai_changeset(ctx.clone(), cs_id)
.compat()
.await?;
Result::<_, anyhow::Error>::Ok(HookFailure {
hook_name,
cs_id,
info,
})
})
.collect::<futures::stream::FuturesUnordered<_>>()
.try_collect()
.await?;
Err(BundleResolverError::HookError(rejections))
}