From 6d343feef0c157639e8238f6c845679e48b90c86 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Sun, 5 May 2024 16:20:58 +0000 Subject: [PATCH] whitespace diff reduction --- control_plane/src/pageserver.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/control_plane/src/pageserver.rs b/control_plane/src/pageserver.rs index 4b1dca2170..43a904ab95 100644 --- a/control_plane/src/pageserver.rs +++ b/control_plane/src/pageserver.rs @@ -119,6 +119,7 @@ impl PageServerNode { "pg_distrib_dir='{}'", self.env.pg_distrib_dir_raw().display() ); + let PageServerConf { id, listen_pg_addr, @@ -130,9 +131,12 @@ impl PageServerNode { get_impl, validate_vectored_get, } = &self.conf; + let id = format!("id={}", id); + let http_auth_type_param = format!("http_auth_type='{}'", http_auth_type); let listen_http_addr_param = format!("listen_http_addr='{}'", listen_http_addr); + 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 = if let Some(virtual_file_io_engine) = virtual_file_io_engine { @@ -155,7 +159,9 @@ impl PageServerNode { } else { String::new() }; + let broker_endpoint_param = format!("broker_endpoint='{}'", self.env.broker.client_url()); + let mut config_pieces = vec![ id, pg_distrib_dir_param, @@ -169,6 +175,7 @@ impl PageServerNode { get_impl, validate_vectored_get, ]; + if let Some(control_plane_api) = &self.env.control_plane_api { config_pieces.push(format!( "control_plane_api='{}'", @@ -185,6 +192,7 @@ impl PageServerNode { config_pieces.push(format!("control_plane_api_token='{}'", jwt_token)); } } + if !cli_overrides.contains_key("remote_storage") { config_pieces.push(format!( "remote_storage={{local_path='../{PAGESERVER_REMOTE_STORAGE_DIR}'}}"