diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs index d188a64464..eaba291e49 100644 --- a/pageserver/src/page_service.rs +++ b/pageserver/src/page_service.rs @@ -1250,7 +1250,7 @@ impl PageServerHandler { .send(Batch::Request(req), |batch, req| match (batch, req) { (Batch::Request(ref mut batch), Batch::Request(req)) => { Self::pagestream_do_batch(max_batch_size, batch, req) - .map_err(|req| Batch::Request(req)) + .map_err(Batch::Request) } (Batch::Request(_), x @ Batch::ReadError(_)) => Err(x), (Batch::ReadError(_), Batch::Request(_) | Batch::ReadError(_)) => { diff --git a/test_runner/performance/pageserver/test_page_service_batching.py b/test_runner/performance/pageserver/test_page_service_batching.py index 46fa65db5d..29d3f41179 100644 --- a/test_runner/performance/pageserver/test_page_service_batching.py +++ b/test_runner/performance/pageserver/test_page_service_batching.py @@ -19,7 +19,6 @@ class PageServicePipeliningConfig: max_batch_size: int - NON_BATCHABLE: list[Optional[PageServicePipeliningConfig]] = [None] for max_batch_size in [1, 32]: NON_BATCHABLE.append(PageServicePipeliningConfig(max_batch_size)) @@ -253,10 +252,7 @@ def test_throughput( PRECISION_CONFIGS: list[Optional[PageServicePipeliningConfig]] = [None] for max_batch_size in [1, 32]: - for protocol_pipelining_mode in PROTOCOL_PIPELINING_MODES: - PRECISION_CONFIGS.append( - PageServicePipeliningConfig(max_batch_size, protocol_pipelining_mode) - ) + PRECISION_CONFIGS.append(PageServicePipeliningConfig(max_batch_size)) @pytest.mark.parametrize(