Skip to content

Commit

Permalink
land_service: use DbLocator to find master db region instead of smc f…
Browse files Browse the repository at this point in the history
…ake tiers

Summary: Use of smc fake tiers is discouraged and we have to whitelist our binaries in order to use it. This is error prone as the whitelist applies to paths so any changes in the path of the build rules for our binaries can cause failures. Use `DbLocator` instead to find the region of db master. I'm gating this behind a JK for easy rollback.

Reviewed By: clara-9

Differential Revision: D66710123

fbshipit-source-id: 6858faa12d40dc4d7f516ecfe2687feafe34a0b6
  • Loading branch information
YousefSalama authored and facebook-github-bot committed Dec 4, 2024
1 parent 062e8cc commit 91c9c62
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
"scm/mononoke:changeset_path_context_use_skeleton_manifest_v2": true,
"scm/mononoke:case_conflicts_check_use_ccsm": true,
"scm/mononoke:should_set_committer_info_to_author_info_if_empty": true,
"scm/mononoke:megarepo_disable_mutable_rename_creation": false
"scm/mononoke:megarepo_disable_mutable_rename_creation": false,
"scm/mononoke:land_service_find_region_using_db_locator": true
},
"ints": {
"scm/mononoke_timeouts:repo_client_clone_timeout_secs": 14400,
Expand Down
12 changes: 7 additions & 5 deletions eden/mononoke/pushrebase/TARGETS
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,11 @@ rust_library(
name = "pushrebase_client",
srcs = glob(["client/**/*.rs"]),
autocargo = {"cargo_toml_dir": "client"},
deps = [
deps = ([
"fbsource//third-party/rust:anyhow",
"fbsource//third-party/rust:async-trait",
"fbsource//third-party/rust:bytes",
"fbsource//third-party/rust:slog",
"//common/rust/smc-thrift:smc-thrift",
"//common/smc/if:Smc2-rust-clients",
"//eden/mononoke/bookmarks:bookmarks",
"//eden/mononoke/bookmarks:bookmarks_movement",
"//eden/mononoke/bookmarks:bookmarks_types",
Expand All @@ -114,9 +112,13 @@ rust_library(
"//eden/mononoke/server/context:context",
] + ([] if rust_oss.is_oss_build() else [
"fbsource//third-party/rust:arc-swap",
"fbsource//third-party/rust:regex",
"//eden/mononoke/land_service/if:land_service_if-rust",
"//eden/mononoke/land_service/if:land_service_if-rust-clients",
"//eden/mononoke/repo_attributes/repo_identity:repo_identity",
]),
"//common/rust/mysql:mysql_client",
"fbsource//third-party/rust:regex",
"//common/rust/shed/justknobs_stub:justknobs",
"//common/rust/smc-thrift:smc-thrift",
"//common/smc/if:Smc2-rust-clients",
])),
)
1 change: 1 addition & 0 deletions eden/mononoke/pushrebase/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ bookmarks_types = { version = "0.1.0", path = "../../bookmarks/bookmarks_types"
bytes = { version = "1.6.0", features = ["serde"] }
context = { version = "0.1.0", path = "../../server/context" }
hooks = { version = "0.1.0", path = "../../hooks" }
justknobs = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
metaconfig_types = { version = "0.1.0", path = "../../metaconfig/types" }
mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }
pushrebase = { version = "0.1.0", path = ".." }
Expand Down

0 comments on commit 91c9c62

Please sign in to comment.