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

hgcommands: avoid deadlock setting up fail points

Browse Source 
Summary:
FailScenario nested in a single thread can cause deadlock on a Mutex, confirmed
by gdb backtrace. Fix that by avoiding nested FailScenario in a single thread.

Reviewed By: kulshrax

Differential Revision: D30052693

fbshipit-source-id: 8d38b2e40ec30c8024e563f079d2595d76bbae1b
This commit is contained in:
Jun Wu 2021-08-02 13:26:26 -07:00 committed by Facebook GitHub Bot
parent cb48ca1326
commit fd10938296
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
eden/scm/lib/hgcommands/src/run.rs
View File

@ -19,6 +19,7 @@ use hg_http::HgHttpConfig;
use once_cell::sync::Lazy;
use parking_lot::Mutex;
use progress_model::Registry;
use std::cell::Cell;
use std::env;
use std::fs::File;
use std::io;
@ -70,7 +71,7 @@ pub fn run_command(args: Vec<String>, io: &IO) -> i32 {
Ok(res) => res,
};
let scenario = FailScenario::setup();
let scenario = setup_fail_points();
setup_eager_repo();
// This is intended to be "process start". "exec/hgmain" seems to be
@ -171,7 +172,9 @@ pub fn run_command(args: Vec<String>, io: &IO) -> i32 {
// so we need to flush now.
blackbox::sync();
scenario.teardown();
if let Some(scenario) = scenario {
scenario.teardown();
}
exit_code
}
@ -568,3 +571,19 @@ fn setup_eager_repo() {
*REGISTERED
}
thread_local! {
static FAIL_SETUP: Cell<bool> = Cell::new(false);
}
fn setup_fail_points<'a>() -> Option<FailScenario<'a>> {
FAIL_SETUP.with(|b| {
if b.get() {
// Already setup.
None
} else {
b.set(true);
Some(FailScenario::setup())
}
})
}