Deuxfleurs/garage
41
56
Fork 73
Code Issues 98 Pull requests 14 Releases 30 Wiki Activity

Merge pull request 'Filter nodes Garage tries to connect to' (#719) from reconnect-only-current into main
All checks were successful
ci/woodpecker/push/debug Pipeline was successful
Details

Browse source 
Reviewed-on: #719
This commit is contained in:
Alex 2024-02-20 10:37:11 +00:00
commit 203bb10035
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/rpc/system.rs
View file

@ -728,15 +728,18 @@ impl System {
async fn discovery_loop(self: &Arc<Self>, mut stop_signal: watch::Receiver<bool>) {
while !*stop_signal.borrow() {
let not_configured = self.ring.borrow().layout.check().is_err();
let no_peers = self.peering.get_peer_list().len() < self.replication_factor;
let expected_n_nodes = self.ring.borrow().layout.num_nodes();
let bad_peers = self
let n_connected = self
.peering
.get_peer_list()
.iter()
.filter(|p| p.is_up())
.count() != expected_n_nodes;
.count();
let not_configured = self.ring.borrow().layout.check().is_err();
let no_peers = n_connected < self.replication_factor;
let expected_n_nodes = self.ring.borrow().layout.num_nodes();
let bad_peers = n_connected != expected_n_nodes;
if not_configured || no_peers || bad_peers {
info!("Doing a bootstrap/discovery step (not_configured: {}, no_peers: {}, bad_peers: {})", not_configured, no_peers, bad_peers);
@ -783,6 +786,14 @@ impl System {
}
}
if !not_configured && !no_peers {
// If the layout is configured, and we already have some connections
// to other nodes in the cluster, we can skip trying to connect to
// nodes that are not in the cluster layout.
let ring = self.ring.borrow();
ping_list.retain(|(id, _)| ring.layout.node_ids().contains(&(*id).into()));
}
for (node_id, node_addr) in ping_list {
let self2 = self.clone();
tokio::spawn(async move {