Introduce Metadata Cache Config

Summary: Essentially the fbcode equivalent of D72857433. To be landed once the configerator diff has landed

Reviewed By: lmvasquezg

Differential Revision: D72862134

fbshipit-source-id: 6d7035015c938668ca47e9c79395d7687a7a1d0b

Author: RajivTS

configerator/structs/scm/mononoke/repos/repos.thrift

@@ -1,4 +1,4 @@
-// @generated SignedSource<<8f8c9c9b9a7a0b180e962aabef6f7a1b>>
+// @generated SignedSource<<4264b9c6ce74f4599e6b42ba110fa093>>
 // DO NOT EDIT THIS FILE MANUALLY!
 // This file is a mechanical copy of the version in the configerator repo. To
 // modify it, edit the copy in the configerator repo instead and copy it over by
@@ -305,6 +305,31 @@ struct RawRepoConfig {
   68: optional RawModernSyncConfig modern_sync_config;
   // Expose continuous stats about repo contents, this is for when mononoke server is the receiving end of a sync
   69: optional bool log_repo_stats;
+  // Configuration controlling the caching mechanism used for different types of Mononoke metadata
+  // (e.g. bookmarks, bonsai hash mappings, git symref mappings, etc.)
+  70: optional RawMetadataCacheConfig metadata_cache_config;
+}
+
+// Mode in which metadata cache updater tails the input category for updates
+struct RawTailing {
+  // The scribe category to tail for bookmark updates
+  1: string category;
+}
+// Mode in which metadata cache updater directly polls the XDB periodically for updates
+struct RawPolling {}
+
+// Enum controlling how certain Mononoke metadata cache is updated
+union RawMetadataCacheUpdateMode {
+  1: RawTailing tailing;
+  2: RawPolling polling;
+}
+
+// Configuration controlling the caching mechanism used for different types of Mononoke metadata
+// (e.g. bookmarks, bonsai hash mappings, git symref mappings, etc.)
+struct RawMetadataCacheConfig {
+  1: optional RawMetadataCacheUpdateMode wbc_update_mode;
+  2: optional RawMetadataCacheUpdateMode tags_update_mode;
+  3: optional RawMetadataCacheUpdateMode content_refs_update_mode;
 }
 
 // Configuration for connecting to Zelos

eden/mononoke/metaconfig/parser/src/config.rs

@@ -245,6 +245,7 @@ fn parse_with_repo_definition(
         git_configs,
         modern_sync_config,
         log_repo_stats,
+        metadata_cache_config,
         ..
     } = named_repo_config;
 
@@ -371,7 +372,9 @@ fn parse_with_repo_definition(
     let modern_sync_config = modern_sync_config.convert()?;
     let log_repo_stats = log_repo_stats.unwrap_or(false);
     let objects_count_multiplier = objects_count_multiplier.map(ObjectsCountMultiplier::new);
-
+    let metadata_cache_config = metadata_cache_config
+        .map(|cache_config| cache_config.convert())
+        .transpose()?;
     Ok(RepoConfig {
         enabled,
         storage_config,
@@ -425,6 +428,7 @@ fn parse_with_repo_definition(
         git_configs,
         modern_sync_config,
         log_repo_stats,
+        metadata_cache_config,
     })
 }
 
@@ -584,6 +588,8 @@ mod test {
     use metaconfig_types::LfsParams;
     use metaconfig_types::LocalDatabaseConfig;
     use metaconfig_types::LoggingDestination;
+    use metaconfig_types::MetadataCacheConfig;
+    use metaconfig_types::MetadataCacheUpdateMode;
     use metaconfig_types::MetadataDatabaseConfig;
     use metaconfig_types::MetadataLoggerConfig;
     use metaconfig_types::MultiplexId;
@@ -976,6 +982,10 @@ mod test {
             bookmarks = ["master", "release"]
             sleep_interval_secs = 100
 
+            [metadata_cache_config]
+            wbc_update_mode = { tailing = { category = "scribe_category" } }
+            tags_update_mode = { polling = {} }            
+            
             [x_repo_sync_source_mapping.mapping.aros]
             bookmark_regex = "master"
             backsync_enabled = true            
@@ -1423,6 +1433,13 @@ mod test {
                 },
                 modern_sync_config: None,
                 log_repo_stats: false,
+                metadata_cache_config: Some(MetadataCacheConfig {
+                    wbc_update_mode: Some(MetadataCacheUpdateMode::Tailing {
+                        category: "scribe_category".to_string(),
+                    }),
+                    tags_update_mode: Some(MetadataCacheUpdateMode::Polling),
+                    content_refs_update_mode: None,
+                }),
             },
         );
 
@@ -1504,6 +1521,7 @@ mod test {
                 },
                 modern_sync_config: None,
                 log_repo_stats: false,
+                metadata_cache_config: None,
             },
         );
         assert_eq!(

eden/mononoke/metaconfig/parser/src/convert/repo.rs

@@ -8,6 +8,7 @@
 use std::collections::HashMap;
 
 use anyhow::anyhow;
+use anyhow::bail;
 use anyhow::Context;
 use anyhow::Result;
 use bookmarks_types::BookmarkKey;
@@ -38,6 +39,8 @@ use metaconfig_types::InfinitepushNamespace;
 use metaconfig_types::InfinitepushParams;
 use metaconfig_types::LfsParams;
 use metaconfig_types::LoggingDestination;
+use metaconfig_types::MetadataCacheConfig;
+use metaconfig_types::MetadataCacheUpdateMode;
 use metaconfig_types::MetadataLoggerConfig;
 use metaconfig_types::ModernSyncChannelConfig;
 use metaconfig_types::ModernSyncConfig;
@@ -90,6 +93,8 @@ use repos::RawInfinitepushParams;
 use repos::RawLfsParams;
 use repos::RawLoggingDestination;
 use repos::RawLoggingDestinationScribe;
+use repos::RawMetadataCacheConfig;
+use repos::RawMetadataCacheUpdateMode;
 use repos::RawMetadataLoggerConfig;
 use repos::RawModernSyncConfig;
 use repos::RawPushParams;
@@ -955,3 +960,39 @@ impl Convert for RawCommitCloudConfig {
         })
     }
 }
+
+impl Convert for RawMetadataCacheUpdateMode {
+    type Output = MetadataCacheUpdateMode;
+    fn convert(self) -> Result<Self::Output> {
+        let cache_update_mode = match self {
+            RawMetadataCacheUpdateMode::tailing(tailing) => MetadataCacheUpdateMode::Tailing {
+                category: tailing.category,
+            },
+            RawMetadataCacheUpdateMode::polling(_) => MetadataCacheUpdateMode::Polling,
+            RawMetadataCacheUpdateMode::UnknownField(f) => {
+                bail!("Unsupported MetadataCacheUpdateMode {}", f)
+            }
+        };
+        Ok(cache_update_mode)
+    }
+}
+
+impl Convert for RawMetadataCacheConfig {
+    type Output = MetadataCacheConfig;
+    fn convert(self) -> Result<Self::Output> {
+        Ok(MetadataCacheConfig {
+            wbc_update_mode: self
+                .wbc_update_mode
+                .map(|mode| mode.convert())
+                .transpose()?,
+            tags_update_mode: self
+                .tags_update_mode
+                .map(|mode| mode.convert())
+                .transpose()?,
+            content_refs_update_mode: self
+                .content_refs_update_mode
+                .map(|mode| mode.convert())
+                .transpose()?,
+        })
+    }
+}

eden/mononoke/metaconfig/types/src/lib.rs

@@ -277,6 +277,9 @@ pub struct RepoConfig {
     pub modern_sync_config: Option<ModernSyncConfig>,
     /// Expose continuous stats about repo contents, this is for when mononoke server is the receiving end of a sync
     pub log_repo_stats: bool,
+    /// Configuration controlling the caching mechanism used for different types of Mononoke metadata
+    /// (e.g. bookmarks, bonsai hash mappings, git symref mappings, etc.)
+    pub metadata_cache_config: Option<MetadataCacheConfig>,
 }
 
 /// Config determining if the repo is deep sharded in the context of a service.
@@ -2077,3 +2080,27 @@ impl Deref for ObjectsCountMultiplier {
         &self.0
     }
 }
+
+/// Enum controlling how certain Mononoke metadata cache is updated
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub enum MetadataCacheUpdateMode {
+    /// Mode in which metadata cache updater tails the input category for updates
+    Tailing {
+        /// Scribe category to tail for updates
+        category: String,
+    },
+    /// Mode in which metadata cache updater directly polls the XDB periodically for updates
+    #[default]
+    Polling,
+}
+
+/// Configuration for Mononoke metadata cache
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub struct MetadataCacheConfig {
+    /// Mode for updating the warm bookmark metadata cache
+    pub wbc_update_mode: Option<MetadataCacheUpdateMode>,
+    /// Mode for updating the tags metadata cache
+    pub tags_update_mode: Option<MetadataCacheUpdateMode>,
+    /// Mode for updating the content refs metadata cache
+    pub content_refs_update_mode: Option<MetadataCacheUpdateMode>,
+}