Skip to content

Remove dead code that sets max_host_weight_ in tests which is of no use #23936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yanavlasov merged 3 commits into from
Nov 10, 2022
Merged

Remove dead code that sets max_host_weight_ in tests which is of no use #23936

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88489da
Remove dead code that sets max_host_weight_ in tests which is of no use
stevenzzzz Nov 10, 2022
90dc147
add unsaved files
stevenzzzz Nov 10, 2022
228e80e
Merge branch 'main' into remove-dead-max-weight-code-in-test
stevenzzzz Nov 10, 2022
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
6 changes: 0 additions & 6 deletions test/common/upstream/load_balancer_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand All @@ -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.

Expand All @@ -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.

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion test/common/upstream/load_balancer_simulation_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::MockLoader> runtime;
auto time_source = std::make_unique<NiceMock<MockTimeSystem>>();
Random::RandomGeneratorImpl random;
Expand Down
1 change: 0 additions & 1 deletion test/common/upstream/subset_lb_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
1 change: 0 additions & 1 deletion test/common/upstream/zone_aware_load_balancer_fuzz_base.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down