diff --git a/control_plane/src/local_env.rs b/control_plane/src/local_env.rs index 2e64489432..b0c87f7814 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 bbafc287f5..711a563ba3 100644 --- a/control_plane/src/pageserver.rs +++ b/control_plane/src/pageserver.rs @@ -57,6 +57,8 @@ impl PageServerNode { listen_http_addr, pg_auth_type: _, http_auth_type, + virtual_file_io_engine: _, + get_vectored_impl: _, } = conf; let (host, port) = parse_host_port(&listen_pg_addr).expect("Unable to parse listen_pg_addr"); @@ -97,6 +99,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); diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py index 975c6d865b..00e6e1849c 100644 --- a/test_runner/fixtures/neon_fixtures.py +++ b/test_runner/fixtures/neon_fixtures.py @@ -500,6 +500,7 @@ class NeonEnvBuilder: self.control_plane_compute_hook_api: Optional[str] = None self.pageserver_virtual_file_io_engine: Optional[str] = pageserver_virtual_file_io_engine + log.info(f"pageserver_virtual_file_io_engine={pageserver_virtual_file_io_engine}") self.pageserver_get_vectored_impl: Optional[str] = None if os.getenv("PAGESERVER_GET_VECTORED_IMPL", "") == "vectored":