From 4756dcd0ccd23a792cd42d3f8a32c7ab2e3ccb0d Mon Sep 17 00:00:00 2001 From: Bojan Serafimov Date: Fri, 9 Jun 2023 09:57:06 -0400 Subject: [PATCH] fmt --- compute_tools/src/compute.rs | 10 ++++------ pageserver/src/page_service.rs | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/compute_tools/src/compute.rs b/compute_tools/src/compute.rs index bcc47519d1..cdda152b30 100644 --- a/compute_tools/src/compute.rs +++ b/compute_tools/src/compute.rs @@ -467,13 +467,13 @@ impl ComputeNode { // Get current spec_id let path = Path::new(&self.pgdata).join("neon_compute_spec_id.txt"); - let current_spec_id = std::fs::read_to_string(&path).ok(); + let current_spec_id = std::fs::read_to_string(path).ok(); // Respec if needed if current_spec_id == Some(spec_id.clone()) { info!("no need to respec"); } else { - info!("respeccing {:?} {:?}", current_spec_id, spec_id.clone()); + info!("respeccing {:?} {:?}", current_spec_id, &spec_id); self.apply_config(&compute_state)?; self.cache_spec_id(&compute_state, spec_id)?; @@ -499,13 +499,11 @@ impl ComputeNode { Ok(pg) } - fn cache_spec_id(&self, compute_state: &ComputeState, spec_id: String) -> anyhow::Result<()>{ + fn cache_spec_id(&self, compute_state: &ComputeState, spec_id: String) -> anyhow::Result<()> { let spec = &compute_state.pspec.as_ref().expect("spec must be set"); let cmd = format!( "set_compute_spec_id {} {} {}", - spec.tenant_id, - spec.timeline_id, - spec_id, + spec.tenant_id, spec.timeline_id, spec_id, ); let mut config = postgres::Config::from_str(&spec.pageserver_connstr)?; diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs index 21c36ae725..d2f875f60d 100644 --- a/pageserver/src/page_service.rs +++ b/pageserver/src/page_service.rs @@ -915,8 +915,7 @@ where self.handle_basebackup_request(pgb, tenant_id, timeline_id, lsn, None, false, ctx) .await?; pgb.write_message_noflush(&BeMessage::CommandComplete(b"SELECT 1"))?; - } - else if query_string.starts_with("set_compute_spec_id ") { + } else if query_string.starts_with("set_compute_spec_id ") { let (_, params_raw) = query_string.split_at("set_compute_spec_id ".len()); let params = params_raw.split_whitespace().collect::>();