apollo_http_server: polling interval in config

Author: Itay-Tsabary-Starkware

crates/apollo_deployments/resources/app_configs/http_server_config.json

@@ -1,6 +1,7 @@
 {
   "http_server_config.dynamic_config.accept_new_txs": true,
   "http_server_config.dynamic_config.max_sierra_program_size": 4194304,
+  "http_server_config.static_config.dynamic_config_poll_interval": 1000,
   "http_server_config.static_config.ip": "0.0.0.0",
   "http_server_config.static_config.port": ""
 }

crates/apollo_deployments/resources/app_configs/replacer_http_server_config.json

@@ -1,6 +1,7 @@
 {
   "http_server_config.dynamic_config.accept_new_txs": true,
   "http_server_config.dynamic_config.max_sierra_program_size": 4194304,
+  "http_server_config.static_config.dynamic_config_poll_interval": 1000,
   "http_server_config.static_config.ip": "0.0.0.0",
   "http_server_config.static_config.port": "$$$_HTTP_SERVER_CONFIG-STATIC_CONFIG-PORT_$$$"
 }

crates/apollo_http_server/src/http_server.rs

@@ -97,12 +97,10 @@ impl HttpServer {
         let app = self.app();
         info!("HttpServer running using socket: {}", addr);
 
-        // TODO(Tsabary): make the poll interval part of the config.
-        let poll_interval = Duration::from_millis(1_000);
         tokio::spawn(dynamic_config_poll(
             self.dynamic_config_tx.clone(),
             self.config_manager_client.clone(),
-            poll_interval,
+            self.config.static_config.dynamic_config_poll_interval,
         ));
 
         // TODO(update the http server struct to hold optional fields of the dynamic_config_tx,

crates/apollo_http_server_config/src/config.rs

@@ -1,13 +1,16 @@
 use std::collections::BTreeMap;
 use std::net::{IpAddr, Ipv4Addr};
+use std::time::Duration;
 
+use apollo_config::converters::deserialize_milliseconds_to_duration;
 use apollo_config::dumping::{prepend_sub_config_name, ser_param, SerializeConfig};
 use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
 pub const HTTP_SERVER_PORT: u16 = 8080;
 pub const DEFAULT_MAX_SIERRA_PROGRAM_SIZE: usize = 4 * 1024 * 1024; // 4MB
+const DEFAULT_DYNAMIC_CONFIG_POLL_INTERVAL_MS: u64 = 1_000; // 1 second.
 
 /// The http server connection related configuration.
 #[derive(Clone, Debug, Default, Serialize, Deserialize, Validate, PartialEq)]
@@ -32,7 +35,13 @@ impl HttpServerConfig {
                 accept_new_txs: true,
                 max_sierra_program_size,
             },
-            static_config: HttpServerStaticConfig { ip, port },
+            static_config: HttpServerStaticConfig {
+                ip,
+                port,
+                dynamic_config_poll_interval: Duration::from_millis(
+                    DEFAULT_DYNAMIC_CONFIG_POLL_INTERVAL_MS,
+                ),
+            },
         }
     }
 
@@ -45,20 +54,34 @@ impl HttpServerConfig {
 pub struct HttpServerStaticConfig {
     pub ip: IpAddr,
     pub port: u16,
+    #[serde(deserialize_with = "deserialize_milliseconds_to_duration")]
+    pub dynamic_config_poll_interval: Duration,
 }
 
 impl SerializeConfig for HttpServerStaticConfig {
     fn dump(&self) -> BTreeMap<ParamPath, SerializedParam> {
         BTreeMap::from_iter([
             ser_param("ip", &self.ip.to_string(), "The http server ip.", ParamPrivacyInput::Public),
             ser_param("port", &self.port, "The http server port.", ParamPrivacyInput::Public),
+            ser_param(
+                "dynamic_config_poll_interval",
+                &self.dynamic_config_poll_interval.as_millis(),
+                "Polling interval (in milliseconds) for dynamic config.",
+                ParamPrivacyInput::Public,
+            ),
         ])
     }
 }
 
 impl Default for HttpServerStaticConfig {
     fn default() -> Self {
-        Self { ip: IpAddr::from(Ipv4Addr::UNSPECIFIED), port: HTTP_SERVER_PORT }
+        Self {
+            ip: IpAddr::from(Ipv4Addr::UNSPECIFIED),
+            port: HTTP_SERVER_PORT,
+            dynamic_config_poll_interval: Duration::from_millis(
+                DEFAULT_DYNAMIC_CONFIG_POLL_INTERVAL_MS,
+            ),
+        }
     }
 }
 

crates/apollo_node/resources/config_schema.json

@@ -2534,6 +2534,11 @@
     "privacy": "Public",
     "value": 4194304
   },
+  "http_server_config.static_config.dynamic_config_poll_interval": {
+    "description": "Polling interval (in milliseconds) for dynamic config.",
+    "privacy": "Public",
+    "value": 1000
+  },
   "http_server_config.static_config.ip": {
     "description": "The http server ip.",
     "privacy": "Public",