From 1da963b2f91309a16aa3b98d6b0ce376d47eb3f8 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Mon, 20 Mar 2023 15:50:23 +0200 Subject: [PATCH] Remove some unused code in control plane. --- control_plane/src/pageserver.rs | 7 ------- control_plane/src/safekeeper.rs | 7 ------- 2 files changed, 14 deletions(-) diff --git a/control_plane/src/pageserver.rs b/control_plane/src/pageserver.rs index db8cb61395..2a8b889d84 100644 --- a/control_plane/src/pageserver.rs +++ b/control_plane/src/pageserver.rs @@ -280,13 +280,6 @@ impl PageServerNode { background_process::stop_process(immediate, "pageserver", &self.pid_file()) } - pub fn page_server_psql(&self, sql: &str) -> Vec { - let mut client = self.pg_connection_config.connect_no_tls().unwrap(); - - println!("Pageserver query: '{sql}'"); - client.simple_query(sql).unwrap() - } - pub fn page_server_psql_client(&self) -> result::Result { self.pg_connection_config.connect_no_tls() } diff --git a/control_plane/src/safekeeper.rs b/control_plane/src/safekeeper.rs index 228968be80..84d6320573 100644 --- a/control_plane/src/safekeeper.rs +++ b/control_plane/src/safekeeper.rs @@ -1,7 +1,6 @@ use std::io::Write; use std::path::PathBuf; use std::process::Child; -use std::sync::Arc; use std::{io, result}; use anyhow::Context; @@ -11,7 +10,6 @@ use reqwest::{IntoUrl, Method}; use thiserror::Error; use utils::{http::error::HttpErrorBody, id::NodeId}; -use crate::pageserver::PageServerNode; use crate::{ background_process, local_env::{LocalEnv, SafekeeperConf}, @@ -65,14 +63,10 @@ pub struct SafekeeperNode { pub env: LocalEnv, pub http_client: Client, pub http_base_url: String, - - pub pageserver: Arc, } impl SafekeeperNode { pub fn from_env(env: &LocalEnv, conf: &SafekeeperConf) -> SafekeeperNode { - let pageserver = Arc::new(PageServerNode::from_env(env)); - SafekeeperNode { id: conf.id, conf: conf.clone(), @@ -80,7 +74,6 @@ impl SafekeeperNode { env: env.clone(), http_client: Client::new(), http_base_url: format!("http://127.0.0.1:{}/v1", conf.http_port), - pageserver, } }