Skip to content

test: fix some flakes that might relate to #5104. #5211

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
htuch merged 1 commit into from
Dec 4, 2018
Merged

test: fix some flakes that might relate to #5104. #5211

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
15 changes: 15 additions & 0 deletions test/integration/http_integration.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ void HttpIntegrationTest::testRouterHeaderOnlyRequestAndResponse(
// The following allows us to test shutting down the server with active connection pool
// connections.
if (!close_upstream) {
fake_upstreams_[0]->set_allow_unexpected_disconnects(true);
test_server_.reset();
}

Expand Down Expand Up @@ -1418,7 +1419,17 @@ void HttpIntegrationTest::testIdleTimeoutWithTwoRequests() {
test_server_->waitForCounterGe("cluster.cluster_0.upstream_cx_idle_timeout", 1);
}

// This is a regression for https://github.com/envoyproxy/envoy/issues/2715 and validates that a
// pending request is not sent on a connection that has been half-closed.
void HttpIntegrationTest::testUpstreamDisconnectWithTwoRequests() {
config_helper_.addConfigModifier([](envoy::config::bootstrap::v2::Bootstrap& bootstrap) {
auto* static_resources = bootstrap.mutable_static_resources();
auto* cluster = static_resources->mutable_clusters(0);
// Ensure we only have one connection upstream, one request active at a time.
cluster->mutable_max_requests_per_connection()->set_value(1);
auto* circuit_breakers = cluster->mutable_circuit_breakers();
circuit_breakers->add_thresholds()->mutable_max_connections()->set_value(1);
});
initialize();
fake_upstreams_[0]->set_allow_unexpected_disconnects(true);

Expand All @@ -1432,6 +1443,10 @@ void HttpIntegrationTest::testUpstreamDisconnectWithTwoRequests() {
IntegrationCodecClientPtr codec_client2 = makeHttpConnection(lookupPort("http"));
auto response2 = codec_client2->makeRequestWithBody(default_request_headers_, 512);

// Validate one request active, the other pending.
Copy link
Copy Markdown
Contributor

@alyssawilk alyssawilk Dec 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

optional nit: Validate that one request is active, the other pending.
(deflaking CI is more important so feel free to land as-is)

test_server_->waitForGaugeEq("cluster.cluster_0.upstream_rq_active", 1);
test_server_->waitForGaugeEq("cluster.cluster_0.upstream_rq_pending_active", 1);

// Response 1.
upstream_request_->encodeHeaders(default_response_headers_, false);
upstream_request_->encodeData(512, true);
Expand Down