rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-06 04:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Librarify common etcd timeline logic

Browse Source
This commit is contained in:
Kirill Bulatov
2022-05-04 18:28:46 +03:00
committed by Kirill Bulatov
parent dd6dca9072
commit d4e155aaa3
15 changed files with 633 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
control_plane/src/local_env.rs
View File

@@ -63,6 +63,10 @@ pub struct LocalEnv {
#[serde(default)]
pub broker_endpoints: Option<String>,
/// A prefix to all to any key when pushing/polling etcd from a node.
#[serde(default)]
pub broker_etcd_prefix: Option<String>,
pub pageserver: PageServerConf,
#[serde(default)]

5
control_plane/src/safekeeper.rs
View File

@@ -77,6 +77,7 @@ pub struct SafekeeperNode {
pub pageserver: Arc<PageServerNode>,
broker_endpoints: Option<String>,
broker_etcd_prefix: Option<String>,
}
impl SafekeeperNode {
@@ -94,6 +95,7 @@ impl SafekeeperNode {
http_base_url: format!("http://127.0.0.1:{}/v1", conf.http_port),
pageserver,
broker_endpoints: env.broker_endpoints.clone(),
broker_etcd_prefix: env.broker_etcd_prefix.clone(),
}
}
@@ -143,6 +145,9 @@ impl SafekeeperNode {
if let Some(ref ep) = self.broker_endpoints {
cmd.args(&["--broker-endpoints", ep]);
}
if let Some(prefix) = self.broker_etcd_prefix.as_deref() {
cmd.args(&["--broker-etcd-prefix", prefix]);
}
if !cmd.status()?.success() {
bail!(