Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xds_core_end2end_test: fix federation test timeouts (#29789)

Browse Source
pull/29802/head
Mark D. Roth 3 years ago committed by GitHub
parent 9c23d7999c
commit fb1cc54d41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      test/cpp/end2end/xds/xds_core_end2end_test.cc

32
test/cpp/end2end/xds/xds_core_end2end_test.cc
Unescape View File

@ -743,16 +743,13 @@ TEST_P(XdsFederationTest, FederationTargetAuthorityDefaultResourceTemplate) {
new_route_config);
// Ensure update has reached and send 10 RPCs to the current stub.
WaitForAllBackends(DEBUG_LOCATION, 0, 1);
// Create second channel to new target uri and send 1 RPC .
// Create second channel to new target uri and send 1 RPC.
auto channel2 =
CreateChannel(/*failover_timeout_ms=*/0, kNewServerName, kAuthority);
channel2->GetState(/*try_to_connect=*/true);
ASSERT_TRUE(
channel2->WaitForConnected(grpc_timeout_milliseconds_to_deadline(100)));
auto stub2 = grpc::testing::EchoTestService::NewStub(channel2);
ClientContext context;
EchoRequest request;
request.set_message(kRequestMessage);
RpcOptions().SetupRpc(&context, &request);
EchoResponse response;
grpc::Status status = stub2->Echo(&context, request, &response);
EXPECT_TRUE(status.ok()) << "code=" << status.error_code()
@ -817,16 +814,13 @@ TEST_P(XdsFederationTest, FederationTargetAuthorityWithResourceTemplate) {
new_route_config);
// Ensure update has reached and send 10 RPCs to the current stub.
WaitForAllBackends(DEBUG_LOCATION, 0, 1);
// Create second channel to new target uri and send 1 RPC .
// Create second channel to new target uri and send 1 RPC.
auto channel2 =
CreateChannel(/*failover_timeout_ms=*/0, kNewServerName, kAuthority);
channel2->GetState(/*try_to_connect=*/true);
ASSERT_TRUE(
channel2->WaitForConnected(grpc_timeout_milliseconds_to_deadline(100)));
auto stub2 = grpc::testing::EchoTestService::NewStub(channel2);
ClientContext context;
EchoRequest request;
request.set_message(kRequestMessage);
RpcOptions().SetupRpc(&context, &request);
EchoResponse response;
grpc::Status status = stub2->Echo(&context, request, &response);
EXPECT_TRUE(status.ok()) << "code=" << status.error_code()
@ -854,7 +848,7 @@ TEST_P(XdsFederationTest, TargetUriAuthorityUnknown) {
auto stub2 = grpc::testing::EchoTestService::NewStub(channel2);
ClientContext context;
EchoRequest request;
request.set_message(kRequestMessage);
RpcOptions().SetupRpc(&context, &request);
EchoResponse response;
grpc::Status status = stub2->Echo(&context, request, &response);
EXPECT_EQ(status.error_code(), StatusCode::UNAVAILABLE);
@ -895,7 +889,7 @@ TEST_P(XdsFederationTest, RdsResourceNameAuthorityUnknown) {
auto stub2 = grpc::testing::EchoTestService::NewStub(channel2);
ClientContext context;
EchoRequest request;
request.set_message(kRequestMessage);
RpcOptions().SetupRpc(&context, &request);
EchoResponse response;
grpc::Status status = stub2->Echo(&context, request, &response);
EXPECT_EQ(status.error_code(), StatusCode::UNAVAILABLE);
@ -946,7 +940,7 @@ TEST_P(XdsFederationTest, CdsResourceNameAuthorityUnknown) {
auto stub2 = grpc::testing::EchoTestService::NewStub(channel2);
ClientContext context;
EchoRequest request;
request.set_message(kRequestMessage);
RpcOptions().SetupRpc(&context, &request);
EchoResponse response;
grpc::Status status = stub2->Echo(&context, request, &response);
EXPECT_EQ(status.error_code(), StatusCode::UNAVAILABLE);
@ -1006,7 +1000,7 @@ TEST_P(XdsFederationTest, EdsResourceNameAuthorityUnknown) {
auto stub2 = grpc::testing::EchoTestService::NewStub(channel2);
ClientContext context;
EchoRequest request;
request.set_message(kRequestMessage);
RpcOptions().SetupRpc(&context, &request);
EchoResponse response;
grpc::Status status = stub2->Echo(&context, request, &response);
EXPECT_EQ(status.error_code(), StatusCode::UNAVAILABLE);
@ -1211,19 +1205,17 @@ TEST_P(XdsFederationLoadReportingTest, FederationMultipleLoadReportingTest) {
listener.set_name(kNewListenerName);
SetListenerAndRouteConfiguration(authority_balancer_.get(), listener,
new_route_config);
// Ensure update has reached and send 10 RPCs to the current stub.
// Send kNumRpcsToDefaultBalancer RPCs to the current stub.
CheckRpcSendOk(DEBUG_LOCATION, kNumRpcsToDefaultBalancer);
// Create second channel to new target uri and send 1 RPC .
// Create second channel to new target uri.
auto channel2 =
CreateChannel(/*failover_timeout_ms=*/0, kNewServerName, kAuthority);
channel2->GetState(/*try_to_connect=*/true);
ASSERT_TRUE(
channel2->WaitForConnected(grpc_timeout_milliseconds_to_deadline(100)));
auto stub2 = grpc::testing::EchoTestService::NewStub(channel2);
// Send kNumRpcsToAuthorityBalancer on the second channel.
for (size_t i = 0; i < kNumRpcsToAuthorityBalancer; ++i) {
ClientContext context;
EchoRequest request;
request.set_message(kRequestMessage);
RpcOptions().SetupRpc(&context, &request);
EchoResponse response;
grpc::Status status = stub2->Echo(&context, request, &response);
EXPECT_TRUE(status.ok()) << "code=" << status.error_code()

Write Preview
Loading…
Cancel
Save