asonix/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Pull requests Activity

Merge pull request 'Fix Consul & Kubernetes discovery with new way of doing background things' (#463) from fix-background into main

Browse source 
Reviewed-on: Deuxfleurs/garage#463
This commit is contained in:
Alex 2023-01-03 16:04:40 +00:00
commit 4eb8ca3a52
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/rpc/system.rs
View file

@ -521,52 +521,57 @@ impl System {
// ---- INTERNALS ---- // ---- INTERNALS ----
#[cfg(feature = "consul-discovery")] #[cfg(feature = "consul-discovery")]
async fn advertise_to_consul(self: Arc<Self>) -> Result<(), Error> { async fn advertise_to_consul(self: Arc<Self>) {
let c = match &self.consul_discovery { let c = match &self.consul_discovery {
Some(c) => c, Some(c) => c,
_ => return Ok(()), _ => return,
}; };
let rpc_public_addr = match self.rpc_public_addr { let rpc_public_addr = match self.rpc_public_addr {
Some(addr) => addr, Some(addr) => addr,
None => { None => {
warn!("Not advertising to Consul because rpc_public_addr is not defined in config file and could not be autodetected."); warn!("Not advertising to Consul because rpc_public_addr is not defined in config file and could not be autodetected.");
return Ok(()); return;
} }
}; };
c.publish_consul_service( if let Err(e) = c
self.netapp.id, .publish_consul_service(
&self.local_status.load_full().hostname, self.netapp.id,
rpc_public_addr, &self.local_status.load_full().hostname,
) rpc_public_addr,
.await )
.err_context("Error while publishing Consul service") .await
{
error!("Error while publishing Consul service: {}", e);
}
} }
#[cfg(feature = "kubernetes-discovery")] #[cfg(feature = "kubernetes-discovery")]
async fn advertise_to_kubernetes(self: Arc<Self>) -> Result<(), Error> { async fn advertise_to_kubernetes(self: Arc<Self>) {
let k = match &self.kubernetes_discovery { let k = match &self.kubernetes_discovery {
Some(k) => k, Some(k) => k,
_ => return Ok(()), _ => return,
}; };
let rpc_public_addr = match self.rpc_public_addr { let rpc_public_addr = match self.rpc_public_addr {
Some(addr) => addr, Some(addr) => addr,
None => { None => {
warn!("Not advertising to Kubernetes because rpc_public_addr is not defined in config file and could not be autodetected."); warn!("Not advertising to Kubernetes because rpc_public_addr is not defined in config file and could not be autodetected.");
return Ok(()); return;
} }
}; };
publish_kubernetes_node( if let Err(e) = publish_kubernetes_node(
k, k,
self.netapp.id, self.netapp.id,
&self.local_status.load_full().hostname, &self.local_status.load_full().hostname,
rpc_public_addr, rpc_public_addr,
) )
.await .await
.err_context("Error while publishing node to kubernetes") {
error!("Error while publishing node to Kubernetes: {}", e);
}
} }
/// Save network configuration to disc /// Save network configuration to disc
@ -778,10 +783,10 @@ impl System {
} }
#[cfg(feature = "consul-discovery")] #[cfg(feature = "consul-discovery")]
background::spawn(self.clone().advertise_to_consul()); tokio::spawn(self.clone().advertise_to_consul());
#[cfg(feature = "kubernetes-discovery")] #[cfg(feature = "kubernetes-discovery")]
background::spawn(self.clone().advertise_to_kubernetes()); tokio::spawn(self.clone().advertise_to_kubernetes());
let restart_at = tokio::time::sleep(DISCOVERY_INTERVAL); let restart_at = tokio::time::sleep(DISCOVERY_INTERVAL);
select! { select! {