Merge branch 'test-load-shedding-call-endpoint' into 'master'

test: [NET-1444] Test load shedding  on call endpoint

closes NET-1444 

Closes NET-1444

See merge request dfinity-lab/public/ic!12629

Author: DSharifi

rs/http_endpoints/public/src/call.rs

@@ -3,8 +3,7 @@
 use crate::{
     body::BodyReceiverLayer,
     common::{
-        get_cors_headers, make_plaintext_response, make_response, map_box_error_to_response,
-        remove_effective_canister_id,
+        get_cors_headers, make_plaintext_response, make_response, remove_effective_canister_id,
     },
     metrics::LABEL_UNKNOWN,
     types::ApiReqType,
@@ -33,8 +32,7 @@ use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
 use tower::{
-    limit::GlobalConcurrencyLimitLayer, load_shed::LoadShed, util::BoxCloneService, Service,
-    ServiceBuilder, ServiceExt,
+    limit::GlobalConcurrencyLimitLayer, util::BoxCloneService, Service, ServiceBuilder, ServiceExt,
 };
 
 #[derive(Clone)]
@@ -45,7 +43,7 @@ pub(crate) struct CallService {
     registry_client: Arc<dyn RegistryClient>,
     validator_executor: ValidatorExecutor,
     ingress_sender: IngressIngestionService,
-    ingress_filter: LoadShed<IngressFilterService>,
+    ingress_filter: IngressFilterService,
     malicious_flags: MaliciousFlags,
 }
 
@@ -74,7 +72,7 @@ impl CallService {
                     registry_client,
                     validator_executor,
                     ingress_sender,
-                    ingress_filter: ServiceBuilder::new().load_shed().service(ingress_filter),
+                    ingress_filter,
                     malicious_flags,
                 }),
         );
@@ -262,9 +260,7 @@ impl Service<Request<Vec<u8>>> for CallService {
                 .call((provisional_whitelist, msg.content().clone()))
                 .await
             {
-                Err(err) => {
-                    return Ok(map_box_error_to_response(err));
-                }
+                Err(_) => panic!("Can't panic on Infallible"),
                 Ok(Err(err)) => {
                     return Ok(make_response(err));
                 }

rs/http_endpoints/public/src/lib.rs

@@ -226,8 +226,6 @@ pub fn start_server(
     metrics_registry: &MetricsRegistry,
     config: Config,
     ingress_filter: IngressFilterService,
-    // ingress_sender and query_execution_service are external services with a concurrency limiter.
-    // It is safe to clone them and pass them to a single-threaded context.
     ingress_sender: IngressIngestionService,
     query_execution_service: QueryExecutionService,
     state_reader: Arc<dyn StateReader<State = ReplicatedState>>,

rs/http_endpoints/public/tests/load_shed_test.rs

@@ -359,3 +359,96 @@ fn test_load_shedding_pprof() {
         assert_eq!(StatusCode::OK, ok_request.await.unwrap())
     });
 }
+
+/// Test concurrency limiter for `/call` endpoint and that when the load shedder kicks in
+/// we return 429.
+/// Test scenario:
+/// 1. Set the concurrency limiter for the call service, `max_call_concurrent_requests`, to 1.
+/// 2. Use [`Agent`]  to make an update calls where we wait with responding for the update call
+/// inside the ingress filter service handle.
+/// 3. Concurrently make another update call, and assert it hits the load shedder.
+#[test]
+fn test_load_shedding_update_call() {
+    let rt = Runtime::new().unwrap();
+    let addr = get_free_localhost_socket_addr();
+
+    let config = Config {
+        listen_addr: addr,
+        max_call_concurrent_requests: 1,
+        ..Default::default()
+    };
+
+    let mock_state_manager = basic_state_manager_mock();
+    let mock_consensus_cache = basic_consensus_pool_cache();
+    let mock_registry_client = basic_registry_client();
+
+    let canister = Principal::from_text("223xb-saaaa-aaaaf-arlqa-cai").unwrap();
+
+    let (mut ingress_filter, mut ingress_sender, _) = start_http_endpoint(
+        rt.handle().clone(),
+        config,
+        Arc::new(mock_state_manager),
+        Arc::new(mock_consensus_cache),
+        Arc::new(mock_registry_client),
+        Arc::new(Pprof::default()),
+    );
+
+    let ingress_filter_running = Arc::new(Notify::new());
+    let load_shedder_returned = Arc::new(Notify::new());
+
+    let ok_agent = Agent::builder()
+        .with_transport(ReqwestHttpReplicaV2Transport::create(format!("http://{}", addr)).unwrap())
+        .build()
+        .unwrap();
+
+    let load_shedded_agent = ok_agent.clone();
+
+    let ingress_filter_running_clone = ingress_filter_running.clone();
+    let load_shedder_returned_clone = load_shedder_returned.clone();
+
+    let load_shedded_agent_handle = rt.spawn(async move {
+        ingress_filter_running_clone.notified().await;
+        let resp = load_shedded_agent
+            .update(&canister, "some method")
+            .call()
+            .await;
+        load_shedder_returned_clone.notify_one();
+        resp
+    });
+
+    // Ingress sender mock that returns empty Ok(()) response.
+    rt.spawn(async move {
+        loop {
+            let (_, resp) = ingress_sender.next_request().await.unwrap();
+            resp.send_response(Ok(()))
+        }
+    });
+
+    // Mock ingress filter
+    rt.spawn(async move {
+        let (_, resp) = ingress_filter.next_request().await.unwrap();
+        ingress_filter_running.notify_one();
+        load_shedder_returned.notified().await;
+        resp.send_response(Ok(()))
+    });
+
+    rt.block_on(async {
+        wait_for_status_healthy(&ok_agent).await.unwrap();
+        let resp = ok_agent.update(&canister, "some method").call().await;
+
+        assert!(resp.is_ok(), "Received unexpeceted response: {:?}", resp);
+
+        let resp = load_shedded_agent_handle.await.unwrap();
+        let expected_resp = StatusCode::TOO_MANY_REQUESTS;
+
+        match resp {
+            Err(AgentError::HttpError(HttpErrorPayload { status, .. })) => {
+                assert_eq!(expected_resp, status)
+            }
+            _ => panic!(
+                "Load shedder did not kick in. Received unexpeceted response: {:?}",
+                resp
+            ),
+        }
+    });
+}