Skip to content

lrs: additional testing for should_send_locality_stats #42283

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

lrs: additional testing for should_send_locality_stats #42283

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 62 additions & 5 deletions test/integration/load_stats_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,13 @@ class LoadStatsIntegrationTest : public Grpc::GrpcClientIntegrationParamTest,
}
}

ABSL_MUST_USE_RESULT AssertionResult
waitForLoadStatsRequest(const std::vector<envoy::config::endpoint::v3::UpstreamLocalityStats>&
expected_locality_stats,
uint64_t dropped = 0, bool drop_overload_test = false) {
ABSL_MUST_USE_RESULT AssertionResult waitForLoadStatsRequest(
const std::vector<envoy::config::endpoint::v3::UpstreamLocalityStats>&
expected_locality_stats,
uint64_t dropped = 0, bool drop_overload_test = false, bool expect_cluster_stats = false) {
Event::TestTimeSystem::RealTimeBound bound(TestUtility::DefaultTimeout);
Protobuf::RepeatedPtrField<envoy::config::endpoint::v3::ClusterStats> expected_cluster_stats;
if (!expected_locality_stats.empty() || dropped != 0) {
if (!expected_locality_stats.empty() || dropped != 0 || expect_cluster_stats) {
auto* cluster_stats = expected_cluster_stats.Add();
cluster_stats->set_cluster_name("cluster_0");
// Verify the eds service_name is passed back.
Expand Down Expand Up @@ -689,6 +689,63 @@ TEST_P(LoadStatsIntegrationTest, InProgress) {
cleanupLoadStatsConnection();
}

// Validate load report before and after successful request
TEST_P(LoadStatsIntegrationTest, InProgressThenSuccess) {
initialize();
waitForLoadStatsStream();
ASSERT_TRUE(waitForLoadStatsRequest({}));
loadstats_stream_->startGrpcStream();
updateClusterLoadAssignment({{0}}, {}, {}, {});
requestLoadStatsResponse({"cluster_0"});

initiateClientConnection();

// First window: stats should be sent because rq_issued=1, rq_active=1.
ASSERT_TRUE(waitForLoadStatsRequest({localityStats("winter", 0, 0, 1, 1)}));

waitForUpstreamResponse(0, 200);

// Second window:
// rq_issued=0, rq_active=0. Stats NOT sent for the locality.
// We expect cluster stats to be present but with empty locality stats.
ASSERT_TRUE(waitForLoadStatsRequest({}, 0, false, true));

cleanupUpstreamAndDownstream();
cleanupLoadStatsConnection();
}

// Validate that stats are reported when a request spans multiple windows.
TEST_P(LoadStatsIntegrationTest, RequestActiveForMultipleWindows) {
initialize();
waitForLoadStatsStream();
ASSERT_TRUE(waitForLoadStatsRequest({}));
loadstats_stream_->startGrpcStream();
updateClusterLoadAssignment({{0}}, {}, {}, {});
requestLoadStatsResponse({"cluster_0"});

initiateClientConnection();
// First window: stats should be sent because rq_issued=1, rq_active=1.
ASSERT_TRUE(waitForLoadStatsRequest({localityStats("winter", 0, 0, 1, 1)}));

// Second window: request is still active.
// Stats ARE sent because rq_active=1 and the runtime feature
// "envoy.reloadable_features.report_load_when_rq_active_is_non_zero" is
// enabled by default.
ASSERT_TRUE(waitForLoadStatsRequest({localityStats("winter", 0, 0, 1, 0)}));

// Finish the request now
waitForUpstreamResponse(0, 200);

// Third window: Stats are NOT sent because rq_issued=0 and rq_active=0.
// Even though rq_success=1, it is not checked by the current logic.
// This demonstrates that success/error stats are lost if no new requests are
// issued in the window.
ASSERT_TRUE(waitForLoadStatsRequest({}, 0, false, true));

cleanupUpstreamAndDownstream();
cleanupLoadStatsConnection();
}

// Validate the load reports for dropped requests make sense.
TEST_P(LoadStatsIntegrationTest, Dropped) {
config_helper_.addConfigModifier([](envoy::config::bootstrap::v3::Bootstrap& bootstrap) {
Expand Down