From dbabd4e4ea93a7deb9eecaa84e8845fdba572d6c Mon Sep 17 00:00:00 2001
From: Christian Schwarz <christian@neon.tech>
Date: Tue, 12 Mar 2024 20:09:01 +0000
Subject: [PATCH] Revert "expose that pageserver_virtual_file_io_engine test
 param was never used (same for get_vectored_impl)"

This reverts commit 5b8888ce6b4dca61479dee79d4ff4f2ec9548b88.
---
 control_plane/src/local_env.rs        | 6 ------
 control_plane/src/pageserver.rs       | 4 ----
 test_runner/fixtures/neon_fixtures.py | 1 -
 3 files changed, 11 deletions(-)

diff --git a/control_plane/src/local_env.rs b/control_plane/src/local_env.rs
index b0c87f7814..2e64489432 100644
--- a/control_plane/src/local_env.rs
+++ b/control_plane/src/local_env.rs
@@ -126,9 +126,6 @@ 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 {
@@ -139,9 +136,6 @@ 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 711a563ba3..bbafc287f5 100644
--- a/control_plane/src/pageserver.rs
+++ b/control_plane/src/pageserver.rs
@@ -57,8 +57,6 @@ 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");
@@ -99,8 +97,6 @@ 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 00e6e1849c..975c6d865b 100644
--- a/test_runner/fixtures/neon_fixtures.py
+++ b/test_runner/fixtures/neon_fixtures.py
@@ -500,7 +500,6 @@ 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":