wal_acceptor -> safekeeper

control_plane/src/compute.rs

@@ -331,14 +331,14 @@ impl PostgresNode {
             // Configure the node to connect to the safekeepers
             conf.append("synchronous_standby_names", "walproposer");
 
-            let wal_acceptors = self
+            let safekeepers = self
                 .env
                 .safekeepers
                 .iter()
                 .map(|sk| format!("localhost:{}", sk.pg_port))
                 .collect::<Vec<String>>()
                 .join(",");
-            conf.append("wal_acceptors", &wal_acceptors);
+            conf.append("wal_acceptors", &safekeepers);
         } else {
             // We only use setup without safekeepers for tests,
             // and don't care about data durability on pageserver,

control_plane/src/safekeeper.rs

@@ -13,8 +13,8 @@ use nix::unistd::Pid;
 use postgres::Config;
 use reqwest::blocking::{Client, RequestBuilder, Response};
 use reqwest::{IntoUrl, Method};
-use thiserror::Error;
 use safekeeper::http::models::TimelineCreateRequest;
+use thiserror::Error;
 use zenith_utils::http::error::HttpErrorBody;
 use zenith_utils::zid::{ZNodeId, ZTenantId, ZTimelineId};