From 88489dababdd901b8174333cdf73de3ba713e976 Mon Sep 17 00:00:00 2001 From: Xin Zhuang Date: Thu, 10 Nov 2022 13:29:59 -0500 Subject: [PATCH 1/2] Remove dead code that sets max_host_weight_ in tests which is of no use Signed-off-by: Xin Zhuang --- test/common/upstream/load_balancer_impl_test.cc | 6 ------ test/common/upstream/subset_lb_test.cc | 1 - 2 files changed, 7 deletions(-) diff --git a/test/common/upstream/load_balancer_impl_test.cc b/test/common/upstream/load_balancer_impl_test.cc index d657bcd74f6c0..9a806c25287aa 100644 --- a/test/common/upstream/load_balancer_impl_test.cc +++ b/test/common/upstream/load_balancer_impl_test.cc @@ -1959,14 +1959,12 @@ TEST_P(LeastRequestLoadBalancerTest, SingleHost) { // Host weight is 1. { EXPECT_CALL(random_, random()).WillOnce(Return(0)).WillOnce(Return(2)).WillOnce(Return(3)); - stats_.max_host_weight_.set(1UL); EXPECT_EQ(hostSet().healthy_hosts_[0], lb_.chooseHost(nullptr)); } // Host weight is 100. { EXPECT_CALL(random_, random()).WillOnce(Return(0)).WillOnce(Return(2)).WillOnce(Return(3)); - stats_.max_host_weight_.set(100UL); EXPECT_EQ(hostSet().healthy_hosts_[0], lb_.chooseHost(nullptr)); } @@ -1991,7 +1989,6 @@ TEST_P(LeastRequestLoadBalancerTest, SingleHost) { TEST_P(LeastRequestLoadBalancerTest, Normal) { hostSet().healthy_hosts_ = {makeTestHost(info_, "tcp://127.0.0.1:80", simTime()), makeTestHost(info_, "tcp://127.0.0.1:81", simTime())}; - stats_.max_host_weight_.set(1UL); hostSet().hosts_ = hostSet().healthy_hosts_; hostSet().runCallbacks({}, {}); // Trigger callbacks. The added/removed lists are not relevant. @@ -2011,7 +2008,6 @@ TEST_P(LeastRequestLoadBalancerTest, PNC) { makeTestHost(info_, "tcp://127.0.0.1:81", simTime()), makeTestHost(info_, "tcp://127.0.0.1:82", simTime()), makeTestHost(info_, "tcp://127.0.0.1:83", simTime())}; - stats_.max_host_weight_.set(1UL); hostSet().hosts_ = hostSet().healthy_hosts_; hostSet().runCallbacks({}, {}); // Trigger callbacks. The added/removed lists are not relevant. @@ -2058,7 +2054,6 @@ TEST_P(LeastRequestLoadBalancerTest, PNC) { TEST_P(LeastRequestLoadBalancerTest, WeightImbalance) { hostSet().healthy_hosts_ = {makeTestHost(info_, "tcp://127.0.0.1:80", simTime(), 1), makeTestHost(info_, "tcp://127.0.0.1:81", simTime(), 2)}; - stats_.max_host_weight_.set(2UL); hostSet().hosts_ = hostSet().healthy_hosts_; hostSet().runCallbacks({}, {}); // Trigger callbacks. The added/removed lists are not relevant. @@ -2183,7 +2178,6 @@ TEST_P(LeastRequestLoadBalancerTest, WeightImbalanceWithCustomActiveRequestBias) TEST_P(LeastRequestLoadBalancerTest, WeightImbalanceCallbacks) { hostSet().healthy_hosts_ = {makeTestHost(info_, "tcp://127.0.0.1:80", simTime(), 1), makeTestHost(info_, "tcp://127.0.0.1:81", simTime(), 2)}; - stats_.max_host_weight_.set(2UL); hostSet().hosts_ = hostSet().healthy_hosts_; hostSet().runCallbacks({}, {}); // Trigger callbacks. The added/removed lists are not relevant. diff --git a/test/common/upstream/subset_lb_test.cc b/test/common/upstream/subset_lb_test.cc index 68c24dfda7de3..672806b53aba2 100644 --- a/test/common/upstream/subset_lb_test.cc +++ b/test/common/upstream/subset_lb_test.cc @@ -171,7 +171,6 @@ class SubsetLoadBalancerTest : public Event::TestUsingSimulatedTime, SubsetLoadBalancerTest() : scope_(stats_store_.createScope("testprefix")), stat_names_(stats_store_.symbolTable()), stats_(ClusterInfoImpl::generateStats(stats_store_, stat_names_)) { - stats_.max_host_weight_.set(1UL); least_request_lb_config_.mutable_choice_count()->set_value(2); } From 90dc14783cf27e455835fb4e0e2c511fa7be6012 Mon Sep 17 00:00:00 2001 From: Xin Zhuang Date: Thu, 10 Nov 2022 13:36:37 -0500 Subject: [PATCH 2/2] add unsaved files Signed-off-by: Xin Zhuang --- test/common/upstream/load_balancer_simulation_test.cc | 1 - test/common/upstream/zone_aware_load_balancer_fuzz_base.cc | 1 - 2 files changed, 2 deletions(-) diff --git a/test/common/upstream/load_balancer_simulation_test.cc b/test/common/upstream/load_balancer_simulation_test.cc index 22d081562f1ad..679831649fbbe 100644 --- a/test/common/upstream/load_balancer_simulation_test.cc +++ b/test/common/upstream/load_balancer_simulation_test.cc @@ -72,7 +72,6 @@ TEST(DISABLED_LeastRequestLoadBalancerWeightTest, Weight) { Stats::IsolatedStoreImpl stats_store; ClusterStatNames stat_names(stats_store.symbolTable()); ClusterStats stats{ClusterInfoImpl::generateStats(stats_store, stat_names)}; - stats.max_host_weight_.set(weight); NiceMock runtime; auto time_source = std::make_unique>(); Random::RandomGeneratorImpl random; diff --git a/test/common/upstream/zone_aware_load_balancer_fuzz_base.cc b/test/common/upstream/zone_aware_load_balancer_fuzz_base.cc index 73b3890089f81..e9ed21b67094c 100644 --- a/test/common/upstream/zone_aware_load_balancer_fuzz_base.cc +++ b/test/common/upstream/zone_aware_load_balancer_fuzz_base.cc @@ -48,7 +48,6 @@ void ZoneAwareLoadBalancerFuzzBase::setupZoneAwareLoadBalancingSpecificLogic() { // Having 3 possible weights, 1, 2, and 3 to provide the state space at least some variation // in regards to weights, which do affect the load balancing algorithm. Cap the amount of // weights at 3 for simplicity's sake - stats_.max_host_weight_.set(3UL); addWeightsToHosts(); }