mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check DNS on replication loop start not at task start (#3243)

Browse source
This commit is contained in:
James Hodgkinson 2024-12-03 13:58:16 +10:00 committed by William Brown
parent 2ee5f0ccc4
commit bc61225600
1 changed files with 44 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
server/core/src/repl/mod.rs
View file

@ -400,14 +400,6 @@ async fn repl_task(
}
};
let socket_addrs = match origin.socket_addrs(|| Some(443)) {
Ok(sa) => sa,
Err(err) => {
error!(?err, "Replica origin could not resolve to ip:port");
return;
}
};
// Setup our tls connector.
let mut ssl_builder = match SslConnector::builder(SslMethod::tls_client()) {
Ok(sb) => sb,
@ -465,20 +457,57 @@ async fn repl_task(
// we keep track of the "last known good" socketaddr so we can try that first next time.
let mut last_working_address: Option<SocketAddr> = None;
// Okay, all the parameters are setup. Now we wait on our interval.
// Okay, all the parameters are set up. Now we replicate on our interval.
loop {
// if the target address worked last time, then let's use it this time!
// we resolve the DNS entry to the ip:port each time we attempt a connection to avoid stale
// DNS issues, ref #3188. If we are unable to resolve the address, we backoff and try again
// as in something like docker the address may change frequently.
//
// Note, if DNS isn't available, we can proceed with the last used working address too. This
// prevents DNS (or lack thereof) from causing a replication outage.
let mut sorted_socket_addrs = vec![];
// If the target address worked last time, then let's use it this time!
if let Some(addr) = last_working_address {
debug!(?last_working_address);
sorted_socket_addrs.push(addr);
};
// this is O(2^n) but we *should* be talking about a small number of addresses for a given hostname
socket_addrs.iter().for_each(|addr| {
if !sorted_socket_addrs.contains(addr) {
sorted_socket_addrs.push(addr.to_owned());
// Default to port 443 if not set in the origin
match origin.socket_addrs(|| Some(443)) {
Ok(mut socket_addrs) => {
// Make every address unique.
socket_addrs.sort_unstable();
socket_addrs.dedup();
// The only possible conflict is with the last working address,
// so lets just check that.
socket_addrs.into_iter().for_each(|addr| {
if Some(&addr) != last_working_address.as_ref() {
// Not already present, append
sorted_socket_addrs.push(addr);
}
});
}
});
Err(err) => {
if let Some(addr) = last_working_address {
warn!(
?err,
"Unable to resolve '{origin}' to ip:port, using last known working address '{addr}'"
);
} else {
warn!(?err, "Unable to resolve '{origin}' to ip:port.");
}
}
};
if sorted_socket_addrs.is_empty() {
warn!(
"No replication addresses available, delaying replication operation for '{origin}'"
);
repl_interval.tick().await;
continue;
}
tokio::select! {
Ok(task) = task_rx.recv() => {