Merge branch 'master' into alexuta/large_sector_size

dfinity · Feb 17, 2025 · 6482d80 · 6482d80
2 parents 4ffd3a8 + b631f08
commit 6482d80
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/ic-os/dev-tools/bare_metal_deployment/benchmark_runner.sh b/ic-os/dev-tools/bare_metal_deployment/benchmark_runner.sh
@@ -8,7 +8,9 @@ mkdir -p /var/lib/ic/data/benchmark
 
 { time dd if=/dev/zero of=/var/lib/ic/data/benchmark/out bs=1M count=10000 oflag=direct; } 2>results/big-dd.log
 { time bash -c 'for i in {1..16}; do dd if=/dev/zero of=/var/lib/ic/data/benchmark/out_${i} bs=1M count=1000 oflag=direct & done ; wait'; } 2>results/small-dds.log
+{ time bash -c 'for i in {1..16}; do dd of=/dev/null if=/var/lib/ic/data/benchmark/out_${i} bs=1M count=1000 iflag=direct & done ; wait'; } 2>results/small-dds-read.log
 fio --filename=/var/lib/ic/data/benchmark/testfile --io_size=10GB --size=60GB --direct=1 --buffered=0 --invalidate 1 --norandommap --random_generator=lfsr --rw=write --bs=4m --ioengine=libaio --iodepth=32 --numjobs=16 --group_reporting --name=throughput-sw-job --eta-newline=1 >results/fio.log
+fio --filename=/var/lib/ic/data/benchmark/testfile --io_size=10GB --size=60GB --direct=1 --buffered=0 --invalidate 1 --norandommap --random_generator=lfsr --rw=read --bs=4m --ioengine=libaio --iodepth=32 --numjobs=16 --group_reporting --name=throughput-sw-job --eta-newline=1 >results/fio-read.log
 
 ./benchmark.sh
 # Can hang system, too unreliable to run on nightly CI

diff --git a/rs/bitcoin/checker/src/main.rs b/rs/bitcoin/checker/src/main.rs
@@ -201,7 +201,7 @@ fn post_upgrade(arg: CheckArg) {
 
 #[ic_cdk::query(hidden = true)]
 fn http_request(req: http::HttpRequest) -> http::HttpResponse {
-    if ic_cdk::api::data_certificate().is_none() {
+    if ic_cdk::api::in_replicated_execution() {
         ic_cdk::trap("update call rejected");
     }
 

diff --git a/rs/bitcoin/ckbtc/minter/src/main.rs b/rs/bitcoin/ckbtc/minter/src/main.rs
@@ -226,7 +226,7 @@ fn get_deposit_fee() -> u64 {
 
 #[query(hidden = true)]
 fn http_request(req: HttpRequest) -> HttpResponse {
-    if ic_cdk::api::data_certificate().is_none() {
+    if ic_cdk::api::in_replicated_execution() {
         ic_cdk::trap("update call rejected");
     }
 

diff --git a/rs/ethereum/cketh/minter/src/main.rs b/rs/ethereum/cketh/minter/src/main.rs
@@ -890,7 +890,7 @@ fn get_events(arg: GetEventsArg) -> GetEventsResult {
 fn http_request(req: HttpRequest) -> HttpResponse {
     use ic_metrics_encoder::MetricsEncoder;
 
-    if ic_cdk::api::data_certificate().is_none() {
+    if ic_cdk::api::in_replicated_execution() {
         ic_cdk::trap("update call rejected");
     }
 

diff --git a/rs/ethereum/ledger-suite-orchestrator/src/main.rs b/rs/ethereum/ledger-suite-orchestrator/src/main.rs
@@ -108,7 +108,7 @@ fn http_request(
     use dashboard::DashboardTemplate;
     use ic_canisters_http_types::HttpResponseBuilder;
 
-    if ic_cdk::api::data_certificate().is_none() {
+    if ic_cdk::api::in_replicated_execution() {
         ic_cdk::trap("update call rejected");
     }
 

diff --git a/rs/ledger_suite/icp/src/lib.rs b/rs/ledger_suite/icp/src/lib.rs
@@ -1230,7 +1230,7 @@ impl Default for FeatureFlags {
 }
 
 pub fn max_blocks_per_request(principal_id: &PrincipalId) -> usize {
-    if ic_cdk::api::data_certificate().is_none() && principal_id.is_self_authenticating() {
+    if ic_cdk::api::in_replicated_execution() && principal_id.is_self_authenticating() {
         return MAX_BLOCKS_PER_INGRESS_REPLICATED_QUERY_REQUEST;
     }
     MAX_BLOCKS_PER_REQUEST