migrate disable_sql_auto_cache to jk

Reviewed By: clara-9 Differential Revision: D52200811 fbshipit-source-id: ba26aa6b07b7a77362953b3d8a80758fd471c545
facebook · Jan 3, 2024 · 75d0ef9 · 75d0ef9
1 parent 8b115a8
commit 75d0ef9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/eden/mononoke/common/rust/sql_ext/Cargo.toml b/eden/mononoke/common/rust/sql_ext/Cargo.toml
@@ -19,6 +19,7 @@ caching_ext = { version = "0.1.0", path = "../caching_ext" }
 fbinit = { version = "0.1.2", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 futures = { version = "0.3.28", features = ["async-await", "compat"] }
 itertools = "0.11.0"
+justknobs = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 maplit = "1.0"
 memcache = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 mysql_async = "0.31.2"

diff --git a/eden/mononoke/common/rust/sql_ext/TARGETS b/eden/mononoke/common/rust/sql_ext/TARGETS
@@ -28,6 +28,7 @@ rust_library(
         "fbsource//third-party/rust:twox-hash",
         "//common/rust/mysql:mysql_client",
         "//common/rust/shed/fbinit:fbinit",
+        "//common/rust/shed/justknobs_stub:justknobs",
         "//common/rust/shed/memcache_stub:memcache",
         "//common/rust/shed/sql:sql",
         "//common/rust/thrift/srclient:srclient",

diff --git a/eden/mononoke/common/rust/sql_ext/src/mononoke_queries.rs b/eden/mononoke/common/rust/sql_ext/src/mononoke_queries.rs
@@ -441,7 +441,7 @@ where
     T: Send + Abomonation + MemcacheEntity + Clone + 'static,
     Fut: Future<Output = Result<T>> + Send,
 {
-    if tunables().disable_sql_auto_cache().unwrap_or_default() {
+    if let Ok(true) = justknobs::eval("scm/mononoke:sql_disable_auto_cache", None, None) {
         return query_with_retry_no_cache(&do_query).await;
     }
     let fetch = || query_with_retry_no_cache(&do_query);

diff --git a/eden/mononoke/tunables/src/lib.rs b/eden/mononoke/tunables/src/lib.rs
@@ -305,8 +305,6 @@ pub struct MononokeTunables {
 
     // Disable SQL queries being retried after admission control errors
     disable_sql_auto_retries: TunableBool,
-    // Disable SQL queries being cached using `cacheable` keyword
-    disable_sql_auto_cache: TunableBool,
     // Enable derivation on service per repo
     enable_remote_derivation: TunableBoolByRepo,