From ace07da7c17d4eeec8b29b9eea2ae84c0d76088c Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Fri, 17 Apr 2020 21:08:43 +0200 Subject: Fix walk_ring_from --- src/membership.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/membership.rs') diff --git a/src/membership.rs b/src/membership.rs index b49607b7..6d758c59 100644 --- a/src/membership.rs +++ b/src/membership.rs @@ -158,21 +158,23 @@ impl Ring { } pub fn walk_ring_from_pos(&self, start: usize, n: usize) -> Vec { + if n >= self.config.members.len() { + return self.config.members.keys().cloned().collect::>(); + } + let mut ret = vec![]; let mut datacenters = vec![]; - for delta in 0..self.ring.len() { - if ret.len() == n { - break; - } - + let mut delta = 0; + while ret.len() < n { let i = (start + delta) % self.ring.len(); + delta += 1; - if datacenters.len() == self.n_datacenters && !ret.contains(&self.ring[i].node) { - ret.push(self.ring[i].node.clone()); - } else if !datacenters.contains(&self.ring[i].datacenter) { + if !datacenters.contains(&self.ring[i].datacenter) { ret.push(self.ring[i].node.clone()); 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()); } } -- cgit v1.2.3