Deuxfleurs/garage
44
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

Fix walk_ring_from

Browse source
This commit is contained in:
Alex 2020-04-17 21:08:43 +02:00
parent 40c48e6a59
commit ace07da7c1
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/block.rs
View file

@ -86,7 +86,7 @@ impl BlockManager {
Ok(f) => f, Ok(f) => f,
Err(e) => { Err(e) => {
// Not found but maybe we should have had it ?? // Not found but maybe we should have had it ??
self.put_to_resync(hash, DEFAULT_TIMEOUT.as_millis() as u64)?; self.put_to_resync(hash, 0)?;
return Err(Into::into(e)); return Err(Into::into(e));
} }
}; };

18
src/membership.rs
View file

@ -158,21 +158,23 @@ impl Ring {
} }
pub fn walk_ring_from_pos(&self, start: usize, n: usize) -> Vec<UUID> { pub fn walk_ring_from_pos(&self, start: usize, n: usize) -> Vec<UUID> {
if n >= self.config.members.len() {
return self.config.members.keys().cloned().collect::<Vec<_>>();
}
let mut ret = vec![]; let mut ret = vec![];
let mut datacenters = vec![]; let mut datacenters = vec![];
for delta in 0..self.ring.len() { let mut delta = 0;
if ret.len() == n { while ret.len() < n {
break;
}
let i = (start + delta) % self.ring.len(); let i = (start + delta) % self.ring.len();
delta += 1;
if datacenters.len() == self.n_datacenters && !ret.contains(&self.ring[i].node) { if !datacenters.contains(&self.ring[i].datacenter) {
ret.push(self.ring[i].node.clone());
} else if !datacenters.contains(&self.ring[i].datacenter) {
ret.push(self.ring[i].node.clone()); ret.push(self.ring[i].node.clone());
datacenters.push(self.ring[i].datacenter); datacenters.push(self.ring[i].datacenter);
} else if datacenters.len() == self.n_datacenters && !ret.contains(&self.ring[i].node) {
ret.push(self.ring[i].node.clone());
} }
} }