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

megarepotool: add check-push-redirection-prereqs subcommand

Browse Source 
Summary: This command will help us understand if it is safe to enable push-redirection with a certain CommitSyncConfigVersion,

Reviewed By: StanislavGlebik

Differential Revision: D24345898

fbshipit-source-id: c2a4c034a9203025ce3534986b3bb986784ff2b1
This commit is contained in:
Kostia Balytskyi 2020-10-19 15:14:28 -07:00 committed by Facebook GitHub Bot
parent 9743d2f06a
commit 65c55d0038
3 changed files with 122 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eden/mononoke/commit_rewriting/megarepo/Cargo.toml
View File

@ -47,6 +47,7 @@ futures = { version = "0.3.5", features = ["async-await", "compat"] }
futures-old = { package = "futures", version = "0.1" }
itertools = "0.8"
maplit = "1.0"
ref-cast = "1.0.2"
regex = "1.3.7"
slog = { version = "2.5", features = ["max_level_debug"] }
tokio = { version = "=0.2.13", features = ["full"] }

25
eden/mononoke/commit_rewriting/megarepo/tool/cli.rs
View File

@ -52,11 +52,14 @@ pub const WAIT_SECS: &str = "wait-secs";
pub const CATCHUP_VALIDATE_COMMAND: &str = "catchup-validate";
pub const MARK_NOT_SYNCED_COMMAND: &str = "mark-not-synced";
pub const INPUT_FILE: &str = "input-file";
pub const CHECK_PUSH_REDIRECTION_PREREQS: &str = "check-push-redirection-prereqs";
pub const VERSION: &str = "version";
pub const RUN_MOVER: &str = "run-mover";
pub const PATH: &str = "path";
pub const BACKFILL_NOOP_MAPPING: &str = "backfill-noop-mapping";
pub const MAPPING_VERSION_NAME: &str = "mapping-version-name";
pub const SOURCE_CHANGESET: &str = "source-changeset";
pub const TARGET_CHANGESET: &str = "target-changeset";
pub fn cs_args_from_matches<'a>(sub_m: &ArgMatches<'a>) -> BoxFuture<ChangesetArgs, Error> {
let message = try_boxfuture!(
@ -493,6 +496,27 @@ pub fn setup_app<'a, 'b>() -> App<'a, 'b> {
.required(true)
);
let check_push_redirection_prereqs_subcommand = SubCommand::with_name(CHECK_PUSH_REDIRECTION_PREREQS)
.about("check the prerequisites of enabling push-redirection at a given commit with a given CommitSyncConfig version")
.arg(
Arg::with_name(SOURCE_CHANGESET)
.help("a source changeset hash or bookmark to check")
.takes_value(true)
.required(true),
)
.arg(
Arg::with_name(TARGET_CHANGESET)
.help("a target changeset hash or bookmark to check")
.takes_value(true)
.required(true),
)
.arg(
Arg::with_name(VERSION)
.help("a version to use")
.takes_value(true)
.required(true),
);
let run_mover_subcommand = SubCommand::with_name(RUN_MOVER)
.about("run mover of a given version to remap paths between source and target repos")
.arg(
@ -552,6 +576,7 @@ pub fn setup_app<'a, 'b>() -> App<'a, 'b> {
))
.subcommand(catchup_validate_subcommand)
.subcommand(mark_not_synced_candidate)
.subcommand(check_push_redirection_prereqs_subcommand)
.subcommand(run_mover_subcommand)
.subcommand(backfill_noop_mapping)
}

102
eden/mononoke/commit_rewriting/megarepo/tool/main.rs
View File

@ -16,6 +16,10 @@ use cmdlib::{args, helpers};
use cmdlib_x_repo::create_commit_syncer_args_from_matches;
use context::CoreContext;
use cross_repo_sync::CommitSyncer;
use cross_repo_sync::{
types::{Source, Target},
validation::verify_working_copy_inner,
};
use fbinit::FacebookInit;
use futures::{
compat::Future01CompatExt,
@ -27,6 +31,7 @@ use metaconfig_types::RepoConfig;
use metaconfig_types::{CommitSyncConfigVersion, MetadataDatabaseConfig};
use mononoke_types::{MPath, RepositoryId};
use movers::get_small_to_large_mover;
use ref_cast::RefCast;
use regex::Regex;
use skiplist::fetch_skiplist_index;
use slog::{info, warn};
@ -56,12 +61,13 @@ use crate::cli::{
cs_args_from_matches, get_catchup_head_delete_commits_cs_args_factory,
get_delete_commits_cs_args_factory, get_gradual_merge_commits_cs_args_factory, setup_app,
BACKFILL_NOOP_MAPPING, BASE_COMMIT_HASH, BONSAI_MERGE, BONSAI_MERGE_P1, BONSAI_MERGE_P2,
CATCHUP_DELETE_HEAD, CATCHUP_VALIDATE_COMMAND, CHANGESET, CHUNKING_HINT_FILE, COMMIT_BOOKMARK,
COMMIT_HASH, DELETION_CHUNK_SIZE, DRY_RUN, EVEN_CHUNK_SIZE, FIRST_PARENT, GRADUAL_MERGE,
GRADUAL_MERGE_PROGRESS, HEAD_BOOKMARK, INPUT_FILE, LAST_DELETION_COMMIT, LIMIT,
MANUAL_COMMIT_SYNC, MAPPING_VERSION_NAME, MARK_NOT_SYNCED_COMMAND, MAX_NUM_OF_MOVES_IN_COMMIT,
MERGE, MOVE, ORIGIN_REPO, PARENTS, PATH, PATH_REGEX, PRE_DELETION_COMMIT, PRE_MERGE_DELETE,
RUN_MOVER, SECOND_PARENT, SYNC_DIAMOND_MERGE, TO_MERGE_CS_ID, VERSION, WAIT_SECS,
CATCHUP_DELETE_HEAD, CATCHUP_VALIDATE_COMMAND, CHANGESET, CHECK_PUSH_REDIRECTION_PREREQS,
CHUNKING_HINT_FILE, COMMIT_BOOKMARK, COMMIT_HASH, DELETION_CHUNK_SIZE, DRY_RUN,
EVEN_CHUNK_SIZE, FIRST_PARENT, GRADUAL_MERGE, GRADUAL_MERGE_PROGRESS, HEAD_BOOKMARK,
INPUT_FILE, LAST_DELETION_COMMIT, LIMIT, MANUAL_COMMIT_SYNC, MAPPING_VERSION_NAME,
MARK_NOT_SYNCED_COMMAND, MAX_NUM_OF_MOVES_IN_COMMIT, MERGE, MOVE, ORIGIN_REPO, PARENTS, PATH,
PATH_REGEX, PRE_DELETION_COMMIT, PRE_MERGE_DELETE, RUN_MOVER, SECOND_PARENT, SOURCE_CHANGESET,
SYNC_DIAMOND_MERGE, TARGET_CHANGESET, TO_MERGE_CS_ID, VERSION, WAIT_SECS,
};
use crate::merging::perform_merge;
use megarepolib::chunking::{
@ -462,6 +468,87 @@ async fn run_manual_commit_sync<'a>(
Ok(())
}
async fn run_check_push_redirection_prereqs<'a>(
ctx: CoreContext,
matches: &ArgMatches<'a>,
sub_m: &ArgMatches<'a>,
) -> Result<(), Error> {
let target_repo_id = args::get_target_repo_id(ctx.fb, &matches)?;
let config_store = args::maybe_init_config_store(ctx.fb, ctx.logger(), &matches)
.ok_or_else(|| format_err!("Failed initializing ConfigStore"))?;
let live_commit_sync_config = CfgrLiveCommitSyncConfig::new(ctx.logger(), &config_store)?;
let commit_syncer_args =
create_commit_syncer_args_from_matches(ctx.fb, ctx.logger(), &matches).await?;
let commit_sync_config =
live_commit_sync_config.get_current_commit_sync_config(&ctx, target_repo_id)?;
let commit_syncer = commit_syncer_args
.try_into_commit_syncer(&commit_sync_config, Arc::new(live_commit_sync_config))?;
let target_repo = commit_syncer.get_target_repo();
let source_repo = commit_syncer.get_source_repo();
info!(
ctx.logger(),
"Resolving source chageset in {}",
source_repo.name()
);
let source_cs_id = helpers::csid_resolve(
ctx.clone(),
source_repo.clone(),
sub_m
.value_of(SOURCE_CHANGESET)
.ok_or_else(|| format_err!("{} not set", SOURCE_CHANGESET))?,
)
.compat()
.await?;
info!(
ctx.logger(),
"Resolving taregt chageset in {}",
target_repo.name()
);
let target_cs_id = helpers::csid_resolve(
ctx.clone(),
target_repo.clone(),
sub_m
.value_of(TARGET_CHANGESET)
.ok_or_else(|| format_err!("{} not set", TARGET_CHANGESET))?,
)
.compat()
.await?;
let version = CommitSyncConfigVersion(
sub_m
.value_of(VERSION)
.ok_or_else(|| format_err!("{} not set", VERSION))?
.to_string(),
);
let mover = commit_syncer.get_mover_by_version(&version)?;
let reverse_mover = commit_syncer.get_reverse_mover_by_version(&version)?;
info!(
ctx.logger(),
"Checking push-redirection prerequisites for {}({})->{}({}), {:?}",
source_cs_id,
source_repo.name(),
target_cs_id,
target_repo.name(),
version,
);
verify_working_copy_inner(
&ctx,
Source::ref_cast(commit_syncer.get_source_repo()),
Target::ref_cast(commit_syncer.get_target_repo()),
Source(source_cs_id),
Target(target_cs_id),
&mover,
&reverse_mover,
)
.await
}
async fn run_catchup_delete_head<'a>(
ctx: CoreContext,
matches: &ArgMatches<'a>,
@ -850,6 +937,9 @@ fn main(fb: FacebookInit) -> Result<()> {
(MARK_NOT_SYNCED_COMMAND, Some(sub_m)) => {
run_mark_not_synced(ctx, &matches, sub_m).await
}
(CHECK_PUSH_REDIRECTION_PREREQS, Some(sub_m)) => {
run_check_push_redirection_prereqs(ctx, &matches, sub_m).await
}
(RUN_MOVER, Some(sub_m)) => run_mover(ctx, &matches, sub_m).await,
(BACKFILL_NOOP_MAPPING, Some(sub_m)) => {
run_backfill_noop_mapping(ctx, &matches, sub_m).await