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

[grpclb e2e test] increase RPC deadlines to fix flakes (#34403)

Browse Source
pull/34410/head
Mark D. Roth 2 years ago committed by GitHub
parent 113dbf5183
commit 0bffb766ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      test/cpp/end2end/grpclb_end2end_test.cc

26
test/cpp/end2end/grpclb_end2end_test.cc
Unescape View File

@ -659,7 +659,7 @@ class GrpclbEnd2endTest : public ::testing::Test {
return response; return response;
} }
Status SendRpc(EchoResponse* response = nullptr, int timeout_ms = 1000, Status SendRpc(EchoResponse* response = nullptr, int timeout_ms = 3000,
bool wait_for_ready = false, bool wait_for_ready = false,
const Status& expected_status = Status::OK) { const Status& expected_status = Status::OK) {
const bool local_response = (response == nullptr); const bool local_response = (response == nullptr);
@ -679,7 +679,7 @@ class GrpclbEnd2endTest : public ::testing::Test {
return status; return status;
} }
void CheckRpcSendOk(const size_t times = 1, const int timeout_ms = 1000, void CheckRpcSendOk(const size_t times = 1, const int timeout_ms = 3000,
bool wait_for_ready = false) { bool wait_for_ready = false) {
for (size_t i = 0; i < times; ++i) { for (size_t i = 0; i < times; ++i) {
EchoResponse response; EchoResponse response;
@ -854,7 +854,7 @@ TEST_F(SingleBalancerTest, ReturnServerStatus) {
// Send a request that the backend will fail, and make sure we get // Send a request that the backend will fail, and make sure we get
// back the right status. // back the right status.
Status expected(StatusCode::INVALID_ARGUMENT, "He's dead, Jim!"); Status expected(StatusCode::INVALID_ARGUMENT, "He's dead, Jim!");
Status actual = SendRpc(/*response=*/nullptr, /*timeout_ms=*/1000, Status actual = SendRpc(/*response=*/nullptr, /*timeout_ms=*/3000,
/*wait_for_ready=*/false, expected); /*wait_for_ready=*/false, expected);
EXPECT_EQ(actual.error_code(), expected.error_code()); EXPECT_EQ(actual.error_code(), expected.error_code());
EXPECT_EQ(actual.error_message(), expected.error_message()); EXPECT_EQ(actual.error_message(), expected.error_message());
@ -870,7 +870,7 @@ TEST_F(SingleBalancerTest, SelectGrpclbWithMigrationServiceConfig) {
"}"); "}");
ScheduleResponseForBalancer( ScheduleResponseForBalancer(
0, BuildResponseForBackends(GetBackendPorts(), {}), 0); 0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
CheckRpcSendOk(1, 1000 /* timeout_ms */, true /* wait_for_ready */); CheckRpcSendOk(1, 3000 /* timeout_ms */, true /* wait_for_ready */);
balancers_[0]->service_.NotifyDoneWithServerlists(); balancers_[0]->service_.NotifyDoneWithServerlists();
// The balancer got a single request. // The balancer got a single request.
EXPECT_EQ(1U, balancers_[0]->service_.request_count()); EXPECT_EQ(1U, balancers_[0]->service_.request_count());
@ -918,7 +918,7 @@ TEST_F(SingleBalancerTest, UsePickFirstChildPolicy) {
ScheduleResponseForBalancer( ScheduleResponseForBalancer(
0, BuildResponseForBackends(GetBackendPorts(), {}), 0); 0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
const size_t kNumRpcs = num_backends_ * 2; const size_t kNumRpcs = num_backends_ * 2;
CheckRpcSendOk(kNumRpcs, 1000 /* timeout_ms */, true /* wait_for_ready */); CheckRpcSendOk(kNumRpcs, 3000 /* timeout_ms */, true /* wait_for_ready */);
balancers_[0]->service_.NotifyDoneWithServerlists(); balancers_[0]->service_.NotifyDoneWithServerlists();
// Check that all requests went to the first backend. This verifies // Check that all requests went to the first backend. This verifies
// that we used pick_first instead of round_robin as the child policy. // that we used pick_first instead of round_robin as the child policy.
@ -948,7 +948,7 @@ TEST_F(SingleBalancerTest, SwapChildPolicy) {
ScheduleResponseForBalancer( ScheduleResponseForBalancer(
0, BuildResponseForBackends(GetBackendPorts(), {}), 0); 0, BuildResponseForBackends(GetBackendPorts(), {}), 0);
const size_t kNumRpcs = num_backends_ * 2; const size_t kNumRpcs = num_backends_ * 2;
CheckRpcSendOk(kNumRpcs, 1000 /* timeout_ms */, true /* wait_for_ready */); CheckRpcSendOk(kNumRpcs, 3000 /* timeout_ms */, true /* wait_for_ready */);
// Check that all requests went to the first backend. This verifies // Check that all requests went to the first backend. This verifies
// that we used pick_first instead of round_robin as the child policy. // that we used pick_first instead of round_robin as the child policy.
EXPECT_EQ(backends_[0]->service_.request_count(), kNumRpcs); EXPECT_EQ(backends_[0]->service_.request_count(), kNumRpcs);
@ -958,7 +958,7 @@ TEST_F(SingleBalancerTest, SwapChildPolicy) {
// Send new resolution that removes child policy from service config. // Send new resolution that removes child policy from service config.
SetNextResolutionAllBalancers(); SetNextResolutionAllBalancers();
WaitForAllBackends(); WaitForAllBackends();
CheckRpcSendOk(kNumRpcs, 1000 /* timeout_ms */, true /* wait_for_ready */); CheckRpcSendOk(kNumRpcs, 3000 /* timeout_ms */, true /* wait_for_ready */);
// Check that every backend saw the same number of requests. This verifies // Check that every backend saw the same number of requests. This verifies
// that we used round_robin. // that we used round_robin.
for (size_t i = 0; i < backends_.size(); ++i) { for (size_t i = 0; i < backends_.size(); ++i) {
@ -1359,7 +1359,7 @@ TEST_F(SingleBalancerTest, FallbackEarlyWhenBalancerChannelFails) {
SetNextResolution(balancer_addresses, backend_addresses); SetNextResolution(balancer_addresses, backend_addresses);
// Send RPC with deadline less than the fallback timeout and make sure it // Send RPC with deadline less than the fallback timeout and make sure it
// succeeds. // succeeds.
CheckRpcSendOk(/* times */ 1, /* timeout_ms */ 1000, CheckRpcSendOk(/* times */ 1, /* timeout_ms */ 3000,
/* wait_for_ready */ false); /* wait_for_ready */ false);
} }
@ -1376,7 +1376,7 @@ TEST_F(SingleBalancerTest, FallbackEarlyWhenBalancerCallFails) {
balancers_[0]->service_.NotifyDoneWithServerlists(); balancers_[0]->service_.NotifyDoneWithServerlists();
// Send RPC with deadline less than the fallback timeout and make sure it // Send RPC with deadline less than the fallback timeout and make sure it
// succeeds. // succeeds.
CheckRpcSendOk(/* times */ 1, /* timeout_ms */ 1000, CheckRpcSendOk(/* times */ 1, /* timeout_ms */ 3000,
/* wait_for_ready */ false); /* wait_for_ready */ false);
} }
@ -1395,7 +1395,7 @@ TEST_F(SingleBalancerTest, FallbackControlledByBalancerBeforeFirstServerlist) {
ScheduleResponseForBalancer(0, resp, 0); ScheduleResponseForBalancer(0, resp, 0);
// Send RPC with deadline less than the fallback timeout and make sure it // Send RPC with deadline less than the fallback timeout and make sure it
// succeeds. // succeeds.
CheckRpcSendOk(/* times */ 1, /* timeout_ms */ 1000, CheckRpcSendOk(/* times */ 1, /* timeout_ms */ 3000,
/* wait_for_ready */ false); /* wait_for_ready */ false);
} }
@ -1437,7 +1437,7 @@ TEST_F(SingleBalancerTest, BackendsRestart) {
CheckRpcSendFailure(); CheckRpcSendFailure();
// Restart backends. RPCs should start succeeding again. // Restart backends. RPCs should start succeeding again.
StartAllBackends(); StartAllBackends();
CheckRpcSendOk(1 /* times */, 2000 /* timeout_ms */, CheckRpcSendOk(1 /* times */, 3000 /* timeout_ms */,
true /* wait_for_ready */); true /* wait_for_ready */);
// The balancer got a single request. // The balancer got a single request.
EXPECT_EQ(1U, balancers_[0]->service_.request_count()); EXPECT_EQ(1U, balancers_[0]->service_.request_count());
@ -1877,7 +1877,7 @@ TEST_F(SingleBalancerTest, DropAllFirst) {
{}, {{"rate_limiting", num_of_drop_by_rate_limiting_addresses}, {}, {{"rate_limiting", num_of_drop_by_rate_limiting_addresses},
{"load_balancing", num_of_drop_by_load_balancing_addresses}}), {"load_balancing", num_of_drop_by_load_balancing_addresses}}),
0); 0);
const Status status = SendRpc(nullptr, 1000, true); const Status status = SendRpc(nullptr, 3000, true);
EXPECT_FALSE(status.ok()); EXPECT_FALSE(status.ok());
EXPECT_EQ(status.error_message(), "drop directed by grpclb balancer"); EXPECT_EQ(status.error_message(), "drop directed by grpclb balancer");
} }
@ -1901,7 +1901,7 @@ TEST_F(SingleBalancerTest, DropAll) {
// fail. // fail.
Status status; Status status;
do { do {
status = SendRpc(nullptr, 1000, true); status = SendRpc(nullptr, 3000, true);
} while (status.ok()); } while (status.ok());
EXPECT_FALSE(status.ok()); EXPECT_FALSE(status.ok());
EXPECT_EQ(status.error_message(), "drop directed by grpclb balancer"); EXPECT_EQ(status.error_message(), "drop directed by grpclb balancer");

Write Preview
Loading…
Cancel
Save