jjanella/ningy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix the test, all pass now

Browse Source
This commit is contained in:
nnhphong
2025-12-10 18:08:54 -05:00
parent 9cae3b767d
commit 7100614950
1 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/balancer/adaptive_weight.rs
View File

@@ -27,7 +27,7 @@ impl AdaptiveWeightBalancer {
.iter() .iter()
.map(|b| AdaptiveNode { .map(|b| AdaptiveNode {
backend: b.clone(), backend: b.clone(),
weight: 0f64, weight: 1f64,
}) })
.collect(); .collect();
@@ -85,7 +85,6 @@ impl Balancer for AdaptiveWeightBalancer {
}; };
let ratio = risk / node.weight; let ratio = risk / node.weight;
if ratio <= threshold { if ratio <= threshold {
return Some(node.backend.clone()); return Some(node.backend.clone());
} }
@@ -172,14 +171,10 @@ mod tests {
let mut b = AdaptiveWeightBalancer::new(backends.clone(), [0.5, 0.2, 0.2, 0.1], 0.5); let mut b = AdaptiveWeightBalancer::new(backends.clone(), [0.5, 0.2, 0.2, 0.1], 0.5);
// initially equal weights // initially equal weights
// update one backend to be heavily loaded // update one backend to be heavily loaded
{ let mut sm0_guard = backends.backends.get(0).unwrap().metrics.write().unwrap();
let mut sm0_guard = backends.backends.get(0).unwrap().metrics.write().unwrap(); sm0_guard.update(90.0, 80.0, 10.0, 5.0);
sm0_guard.update(90.0, 80.0, 10.0, 5.0); let mut sm1_guard = backends.backends.get(1).unwrap().metrics.write().unwrap();
} sm1_guard.update(10.0, 5.0, 1.0, 1.0);
{
let mut sm1_guard = backends.backends.get(1).unwrap().metrics.write().unwrap();
sm1_guard.update(10.0, 5.0, 1.0, 1.0);
}
// Choose backend: should pick the less loaded host server1 // Choose backend: should pick the less loaded host server1
let chosen = b let chosen = b
@@ -203,26 +198,22 @@ mod tests {
fn ratio_triggers_immediate_selection() { fn ratio_triggers_immediate_selection() {
// Arrange two servers where server 1 has composite load 0 and server 2 has composite load 100. // Arrange two servers where server 1 has composite load 0 and server 2 has composite load 100.
// With alpha = 1.0 and two servers, threshold = 1.0 * (r_sum / w_sum) = 1.0 * (100 / 2) = 50. // With alpha = 1.0 and two servers, threshold = 1.0 * (r_sum / w_sum) = 1.0 * (100 / 2) = 50.
// Server 1 ratio = 0 / 1 = 0 <= 50 so it should be chosen immediately. // Server 0 ratio = 0 / 1 = 0 <= 50 so it should be chosen immediately.
let backends = BackendPool::new(vec![ let backends = BackendPool::new(vec![
backend_factory("server-0", "127.0.0.1", 3000), backend_factory("server-0", "127.0.0.1", 3000),
backend_factory("server-1", "127.0.0.1", 3001), backend_factory("server-1", "127.0.0.1", 3001),
]); ]);
let mut b = AdaptiveWeightBalancer::new(backends.clone(), [0.25, 0.25, 0.25, 0.25], 1.0); let mut b = AdaptiveWeightBalancer::new(backends.clone(), [0.25, 0.25, 0.25, 0.25], 1.0);
{ let mut sm0_guard = backends.backends.get(0).unwrap().metrics.write().unwrap();
let mut sm0_guard = backends.backends.get(0).unwrap().metrics.write().unwrap(); sm0_guard.update(0.0, 0.0, 0.0, 0.0);
sm0_guard.update(0.0, 0.0, 0.0, 0.0); let mut sm1_guard = backends.backends.get(1).unwrap().metrics.write().unwrap();
} sm1_guard.update(100.0, 100.0, 100.0, 100.0);
{
let mut sm1_guard = backends.backends.get(1).unwrap().metrics.write().unwrap();
sm1_guard.update(100.0, 100.0, 100.0, 100.0);
}
let chosen = b let chosen = b
.choose_backend(unused_ctx()) .choose_backend(unused_ctx())
.expect("should choose a backend"); .expect("should choose a backend");
assert_eq!(chosen.id, "server-1"); assert_eq!(chosen.id, "server-0");
} }
#[test] #[test]
@@ -237,19 +228,12 @@ mod tests {
]); ]);
// set current_loads (field expected to be public) // set current_loads (field expected to be public)
let mut sm0_guard = backends.backends.get(0).unwrap().metrics.write().unwrap();
{ sm0_guard.update(10.0, 10.0, 10.0, 10.0);
let mut sm0_guard = backends.backends.get(0).unwrap().metrics.write().unwrap(); let mut sm1_guard = backends.backends.get(1).unwrap().metrics.write().unwrap();
sm0_guard.update(10.0, 10.0, 10.0, 10.0); sm1_guard.update(5.0, 5.0, 5.0, 5.0);
} let mut sm2_guard = backends.backends.get(2).unwrap().metrics.write().unwrap();
{ sm2_guard.update(20.0, 20.0, 20.0, 20.0);
let mut sm1_guard = backends.backends.get(1).unwrap().metrics.write().unwrap();
sm1_guard.update(5.0, 5.0, 5.0, 5.0);
}
{
let mut sm2_guard = backends.backends.get(2).unwrap().metrics.write().unwrap();
sm2_guard.update(20.0, 20.0, 20.0, 20.0);
}
// Use coeffs that only consider CPU so composite load is easy to reason about. // Use coeffs that only consider CPU so composite load is easy to reason about.
let mut bal = AdaptiveWeightBalancer::new(backends.clone(), [1.0, 0.0, 0.0, 0.0], 0.5); let mut bal = AdaptiveWeightBalancer::new(backends.clone(), [1.0, 0.0, 0.0, 0.0], 0.5);