From 0a51fd74f08b2e6f23d6e1d60f1f52eb73b40ccc Mon Sep 17 00:00:00 2001 From: Leon Tan Date: Thu, 18 Apr 2024 09:47:24 +0000 Subject: [PATCH] Activate Query Stats --- ic-os/guestos/rootfs/opt/ic/bin/generate-replica-config.sh | 4 ++-- rs/config/src/execution_environment.rs | 2 +- rs/orchestrator/src/firewall.rs | 4 ++-- rs/tests/src/util.rs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ic-os/guestos/rootfs/opt/ic/bin/generate-replica-config.sh b/ic-os/guestos/rootfs/opt/ic/bin/generate-replica-config.sh index 3b5c5103020..dc48853dcab 100755 --- a/ic-os/guestos/rootfs/opt/ic/bin/generate-replica-config.sh +++ b/ic-os/guestos/rootfs/opt/ic/bin/generate-replica-config.sh @@ -234,8 +234,8 @@ BACKUP_PURGING_INTERVAL_SECS="${backup_purging_interval_secs:-3600}" REPLICA_LOG_DEBUG_OVERRIDES="${replica_log_debug_overrides:-[]}" # Default is null (None) MALICIOUS_BEHAVIOR="${malicious_behavior:-null}" -# Defaults to disabled -QUERY_STATS_AGGREGATION="${query_stats_aggregation:-\"Disabled\"}" +# Defaults to enabled +QUERY_STATS_AGGREGATION="${query_stats_aggregation:-\"Enabled\"}" # Default is 600 blocks i.e. around 10min QUERY_STATS_EPOCH_LENGTH="${query_stats_epoch_length:-600}" diff --git a/rs/config/src/execution_environment.rs b/rs/config/src/execution_environment.rs index 034533908cd..9b772c2b9cb 100644 --- a/rs/config/src/execution_environment.rs +++ b/rs/config/src/execution_environment.rs @@ -328,7 +328,7 @@ impl Default for Config { query_cache_max_expiry_time: QUERY_CACHE_MAX_EXPIRY_TIME, query_cache_data_certificate_expiry_time: QUERY_CACHE_DATA_CERTIFICATE_EXPIRY_TIME, max_compilation_cache_size: MAX_COMPILATION_CACHE_SIZE, - query_stats_aggregation: FlagStatus::Disabled, + query_stats_aggregation: FlagStatus::Enabled, query_stats_epoch_length: QUERY_STATS_EPOCH_LENGTH, wasm_chunk_store: FlagStatus::Enabled, stop_canister_timeout_duration: STOP_CANISTER_TIMEOUT_DURATION, diff --git a/rs/orchestrator/src/firewall.rs b/rs/orchestrator/src/firewall.rs index 6640f60ccaf..2d1221208d1 100644 --- a/rs/orchestrator/src/firewall.rs +++ b/rs/orchestrator/src/firewall.rs @@ -671,8 +671,8 @@ mod tests { .replace("{{ replica_log_debug_overrides }}", "[]") .replace("{{ nns_url }}", "http://www.fakeurl.com/") .replace("{{ malicious_behavior }}", "null") - .replace("{{ query_stats_aggregation }}", "\"Disabled\"") - .replace("{{ query_stats_epoch_length }}", "1800"); + .replace("{{ query_stats_aggregation }}", "\"Enabled\"") + .replace("{{ query_stats_epoch_length }}", "600"); let config_source = ConfigSource::Literal(cfg); let config: ConfigOptional = config_source.load().unwrap(); diff --git a/rs/tests/src/util.rs b/rs/tests/src/util.rs index 11425061a99..e1df7618018 100644 --- a/rs/tests/src/util.rs +++ b/rs/tests/src/util.rs @@ -1358,8 +1358,8 @@ pub fn get_config() -> ConfigOptional { .replace("{{ replica_log_debug_overrides }}", "[]") .replace("{{ nns_url }}", "http://www.fakeurl.com/") .replace("{{ malicious_behavior }}", "null") - .replace("{{ query_stats_aggregation }}", "\"Disabled\"") - .replace("{{ query_stats_epoch_length }}", "1800"); + .replace("{{ query_stats_aggregation }}", "\"Enabled\"") + .replace("{{ query_stats_epoch_length }}", "600"); json5::from_str::(&cfg).expect("Could not parse json5") }