diff --git a/control_plane/src/storage.rs b/control_plane/src/storage.rs index d57b8863e9..fb498cff15 100644 --- a/control_plane/src/storage.rs +++ b/control_plane/src/storage.rs @@ -219,22 +219,6 @@ impl PageServerNode { Ok(branch.clone()) } - - pub fn system_id_get(&self) -> Result { - let mut client = self.page_server_psql_client()?; - let query_result = client - .simple_query("identify_system")? - .first() - .map(|msg| match msg { - postgres::SimpleQueryMessage::Row(row) => row.get(0), - _ => None, - }) - .flatten() - .ok_or_else(|| anyhow!("failed to get system_id"))? - .parse::()?; - - Ok(query_result) - } } impl Drop for PageServerNode { diff --git a/integration_tests/src/lib.rs b/integration_tests/src/lib.rs index 462dc28674..b0dafec499 100644 --- a/integration_tests/src/lib.rs +++ b/integration_tests/src/lib.rs @@ -102,8 +102,6 @@ impl TestStorageControlPlane { cplane.pageserver.init().unwrap(); cplane.pageserver.start().unwrap(); - let systemid = cplane.pageserver.system_id_get().unwrap(); - const WAL_ACCEPTOR_PORT: usize = 54321; let datadir_base = local_env.base_data_dir.join("safekeepers"); @@ -115,7 +113,6 @@ impl TestStorageControlPlane { .parse() .unwrap(), data_dir: datadir_base.join(format!("wal_acceptor_{}", i)), - systemid, env: local_env.clone(), pass_to_pageserver: true, }; @@ -298,7 +295,6 @@ impl PostgresNodeExt for PostgresNode { pub struct WalAcceptorNode { listen: SocketAddr, data_dir: PathBuf, - systemid: u64, env: LocalEnv, pass_to_pageserver: bool, } @@ -334,7 +330,6 @@ impl WalAcceptorNode { ) .args(&["-D", self.data_dir.to_str().unwrap()]) .args(&["-l", self.listen.to_string().as_str()]) - .args(&["--systemid", self.systemid.to_string().as_str()]) .args(&ps_arg) .arg("-d") .arg("-n")