From b9c30dbd6b681ab7fb6a7d59ad56ba7b781afeeb Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Tue, 12 Mar 2024 20:24:33 +0000 Subject: [PATCH] fix the parametrization --- control_plane/src/local_env.rs | 6 ++++++ control_plane/src/pageserver.rs | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/control_plane/src/local_env.rs b/control_plane/src/local_env.rs index fab2ec6ef4..c7f22cc8f8 100644 --- a/control_plane/src/local_env.rs +++ b/control_plane/src/local_env.rs @@ -126,6 +126,9 @@ pub struct PageServerConf { // auth type used for the PG and HTTP ports pub pg_auth_type: AuthType, pub http_auth_type: AuthType, + + pub(crate) virtual_file_io_engine: String, + pub(crate) get_vectored_impl: String, } impl Default for PageServerConf { @@ -136,6 +139,9 @@ impl Default for PageServerConf { listen_http_addr: String::new(), pg_auth_type: AuthType::Trust, http_auth_type: AuthType::Trust, + // FIXME: use the ones exposed by pageserver crate + virtual_file_io_engine: "tokio-epoll-uring".to_owned(), + get_vectored_impl: "sequential".to_owned(), } } } diff --git a/control_plane/src/pageserver.rs b/control_plane/src/pageserver.rs index 54c62a31f4..ab2f80fb0c 100644 --- a/control_plane/src/pageserver.rs +++ b/control_plane/src/pageserver.rs @@ -90,6 +90,8 @@ impl PageServerNode { listen_http_addr, pg_auth_type, http_auth_type, + virtual_file_io_engine, + get_vectored_impl, } = &self.conf; let id = format!("id={}", id); @@ -99,6 +101,8 @@ impl PageServerNode { let pg_auth_type_param = format!("pg_auth_type='{}'", pg_auth_type); let listen_pg_addr_param = format!("listen_pg_addr='{}'", listen_pg_addr); + let virtual_file_io_engine = format!("virtual_file_io_engine='{virtual_file_io_engine}'"); + let get_vectored_impl = format!("get_vectored_impl='{get_vectored_impl}'"); let broker_endpoint_param = format!("broker_endpoint='{}'", self.env.broker.client_url()); @@ -110,6 +114,8 @@ impl PageServerNode { listen_http_addr_param, listen_pg_addr_param, broker_endpoint_param, + virtual_file_io_engine, + get_vectored_impl, ]; if let Some(control_plane_api) = &self.env.control_plane_api {