Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion pingora-load-balancing/src/selection/weighted.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,11 @@ impl<H: SelectionAlgorithm> BackendIter for WeightedIterator<H> {

if self.first {
// initial hash, select from the weighted list
self.first = false;
let len = self.backend.weighted.len();
if len == 0 {
return None;
}
self.first = false;
let index = self.backend.weighted[self.index as usize % len];
Some(&self.backend.backends[index as usize])
} else {
Expand Down Expand Up @@ -150,6 +153,18 @@ mod test {
assert_eq!(iter.next(), Some(&b2));
}

#[test]
fn weighted_all_zero_weight_returns_none_instead_of_panicking() {
let b1 = Backend::new_with_weight("1.1.1.1:80", 0).unwrap();
let b2 = Backend::new_with_weight("1.0.0.1:80", 0).unwrap();
let backends = BTreeSet::from_iter([b1, b2]);
let hash: Arc<Weighted<FnvHasher>> = Arc::new(Weighted::build(&backends));

let mut iter = hash.iter(b"test");
assert_eq!(iter.next(), None);
assert_eq!(iter.next(), None);
}

#[test]
fn test_round_robin() {
let b1 = Backend::new("1.1.1.1:80").unwrap();
Expand Down
Loading