Skip to content

Commit 35c29d9

Browse files
sasa-tomicDFINITYManu
authored andcommitted
Revert "feat(MR): [MR-649] Roll out best-effort calls to the first few subnets (#3816)"
This reverts commit df5828f.
1 parent 6e64281 commit 35c29d9

File tree

2 files changed

+8
-42
lines changed

2 files changed

+8
-42
lines changed

rs/config/src/embedders.rs

+7-41
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,14 @@ pub struct FeatureFlags {
159159

160160
impl Default for FeatureFlags {
161161
fn default() -> Self {
162-
use ic_types::PrincipalId;
163-
use std::str::FromStr;
164-
let subnet_id = |id_str: &str| SubnetId::new(PrincipalId::from_str(id_str).unwrap());
162+
// TODO(MR-649): Comment out for stage 1b -- rollout to specific subnets.
163+
// use ic_types::PrincipalId;
164+
// use std::str::FromStr;
165+
// let subnet_id = |id_str: &str| SubnetId::new(PrincipalId::from_str(id_str).unwrap());
165166
let enabled_subnets = vec![
166-
subnet_id("eq6en-6jqla-fbu5s-daskr-h6hx2-376n5-iqabl-qgrng-gfqmv-n3yjr-mqe"),
167-
subnet_id("2fq7c-slacv-26cgz-vzbx2-2jrcs-5edph-i5s2j-tck77-c3rlz-iobzx-mqe"),
168-
subnet_id("4zbus-z2bmt-ilreg-xakz4-6tyre-hsqj4-slb4g-zjwqo-snjcc-iqphi-3qe"),
167+
// subnet_id("eq6en-6jqla-fbu5s-daskr-h6hx2-376n5-iqabl-qgrng-gfqmv-n3yjr-mqe"),
168+
// subnet_id("2fq7c-slacv-26cgz-vzbx2-2jrcs-5edph-i5s2j-tck77-c3rlz-iobzx-mqe"),
169+
// subnet_id("4zbus-z2bmt-ilreg-xakz4-6tyre-hsqj4-slb4g-zjwqo-snjcc-iqphi-3qe"),
169170
];
170171

171172
Self {
@@ -340,38 +341,3 @@ impl Default for Config {
340341
Self::new()
341342
}
342343
}
343-
344-
#[cfg(test)]
345-
mod tests {
346-
use super::*;
347-
use ic_types::PrincipalId;
348-
349-
const SUBNET_1: SubnetId = SubnetId::new(PrincipalId::new(1, [1; 29]));
350-
const SUBNET_2: SubnetId = SubnetId::new(PrincipalId::new(1, [2; 29]));
351-
352-
#[test]
353-
fn test_best_effort_responses_feature_specific_subnets() {
354-
let best_effort_responses = BestEffortResponsesFeature::SpecificSubnets(vec![SUBNET_1]);
355-
356-
assert!(best_effort_responses.is_enabled_on(&SUBNET_1, SubnetType::Application));
357-
assert!(best_effort_responses.is_enabled_on(&SUBNET_1, SubnetType::System));
358-
assert!(!best_effort_responses.is_enabled_on(&SUBNET_2, SubnetType::Application));
359-
assert!(!best_effort_responses.is_enabled_on(&SUBNET_2, SubnetType::System));
360-
}
361-
362-
#[test]
363-
fn test_best_effort_responses_feature_application_subnets_only() {
364-
let best_effort_responses = BestEffortResponsesFeature::ApplicationSubnetsOnly;
365-
366-
assert!(best_effort_responses.is_enabled_on(&SUBNET_1, SubnetType::Application));
367-
assert!(!best_effort_responses.is_enabled_on(&SUBNET_1, SubnetType::System));
368-
}
369-
370-
#[test]
371-
fn test_best_effort_responses_feature_enabled() {
372-
let best_effort_responses = BestEffortResponsesFeature::Enabled;
373-
374-
assert!(best_effort_responses.is_enabled_on(&SUBNET_1, SubnetType::Application));
375-
assert!(best_effort_responses.is_enabled_on(&SUBNET_1, SubnetType::System));
376-
}
377-
}

rs/config/src/execution_environment.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const SUBNET_MEMORY_CAPACITY: NumBytes = NumBytes::new(TIB);
3131
/// Guaranteed response message memory usage is calculated as the total size of
3232
/// enqueued guaranteed responses; plus the maximum allowed response size per
3333
/// reserved guaranteed response slot.
34-
const SUBNET_GUARANTEED_RESPONSE_MESSAGE_MEMORY_CAPACITY: NumBytes = NumBytes::new(15 * GIB);
34+
const SUBNET_GUARANTEED_RESPONSE_MESSAGE_MEMORY_CAPACITY: NumBytes = NumBytes::new(25 * GIB);
3535

3636
/// The limit on how much memory may be used by all guaranteed response messages
3737
/// on a given subnet at the end of a round.

0 commit comments

Comments
 (0)