gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-19 09:36:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Adding consul discovery for WAN federated consul servers' (#1252) from jamin/garage:feature/consul_wan_discovery_v2 into main-v2

Browse Source 
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/1252
This commit is contained in:
Alex
2026-01-07 08:22:05 +00:00
parent 006e78ccea cf22e7b71d
commit f50b342c00
3 changed files with 70 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/consul.rs
+48 -25
View File
@@ -126,38 +126,61 @@ impl ConsulDiscovery {
}
// ---- READING FROM CONSUL CATALOG ----
/// Query Consul for Garage nodes registered under the configured service name.
///
/// This method supports querying multiple Consul datacenters for WAN or
/// multi-datacenter deployments. If `config.datacenters` is set and non-empty,
/// each listed datacenter is queried and the results are aggregated. Otherwise,
/// only the local datacenter is queried. `config.datacenters` does not need to be set
/// when all the datacenters are on the same LAN, in this case service discovery works normally
///
/// # Returns
/// A list of `(NodeID, SocketAddr)` pairs corresponding to all valid discovered
/// nodes across the queried datacenters.
pub async fn get_consul_nodes(&self) -> Result<Vec<(NodeID, SocketAddr)>, ConsulError> {
let url = format!(
"{}/v1/catalog/service/{}",
self.config.consul_http_addr, self.config.service_name
);
let http = self.client.get(&url).send().await?;
let entries: Vec<ConsulQueryEntry> = http.json().await?;
let mut ret = vec![];
for ent in entries {
let ip = ent.address.parse::<IpAddr>().ok();
let pubkey = ent
.meta
.get(&format!("{}-pubkey", META_PREFIX))
.and_then(|k| hex::decode(k).ok())
.and_then(|k| NodeID::from_slice(&k[..]));
if let (Some(ip), Some(pubkey)) = (ip, pubkey) {
ret.push((pubkey, SocketAddr::new(ip, ent.service_port)));
} else {
warn!(
"Could not process node spec from Consul: {:?} (invalid IP address or node ID/pubkey)",
ent
);
let dcs_to_query: Vec<Option<&str>> = match &self.config.datacenters {
dcs if !dcs.is_empty() => dcs.iter().map(|dc| Some(dc.as_str())).collect(),
_ => vec![None],
};
for dc in dcs_to_query {
let url = match dc {
Some(datacenter) => format!(
"{}/v1/catalog/service/{}?dc={}",
self.config.consul_http_addr, self.config.service_name, datacenter
),
None => format!(
"{}/v1/catalog/service/{}",
self.config.consul_http_addr, self.config.service_name
),
};
let http = self.client.get(&url).send().await?;
let entries: Vec<ConsulQueryEntry> = http.json().await?;
for ent in entries {
let ip = ent.address.parse::<IpAddr>().ok();
let pubkey = ent
.meta
.get(&format!("{}-pubkey", META_PREFIX))
.and_then(|k| hex::decode(k).ok())
.and_then(|k| NodeID::from_slice(&k[..]));
if let (Some(ip), Some(pubkey)) = (ip, pubkey) {
ret.push((pubkey, SocketAddr::new(ip, ent.service_port)));
} else {
warn!(
"Could not process node spec from Consul: {:?} (invalid IP address or node ID/pubkey)",
ent
);
}
}
}
debug!("Got nodes from Consul: {:?}", ret);
debug!("Got {} nodes from Consul", ret.len());
Ok(ret)
}
// ---- PUBLISHING TO CONSUL CATALOG ----
pub async fn publish_consul_service(
src/util/config.rs
+2
View File
@@ -257,6 +257,8 @@ pub struct ConsulDiscoveryConfig {
/// Additional service metadata to add
#[serde(default)]
pub meta: Option<std::collections::HashMap<String, String>>,
#[serde(default)]
pub datacenters: Vec<String>,
}
#[derive(Deserialize, Debug, Clone)]