Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

XdsRingHash: Tune timeouts (#30742)

Browse Source 
* XdsRingHash: Tune timeouts

* Add WaitForBackendOptions timeout

* More tuning

* Fix
pull/30744/head
Yash Tibrewal 2 years ago committed by GitHub
parent 283e9665f1
commit 2805b523d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 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. 52
      test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc

52
test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc
Unescape View File

@ -373,10 +373,14 @@ TEST_P(RingHashTest, HeaderHashing) {
{"address_hash", CreateMetadataValueThatHashesToBackend(2)}};
std::vector<std::pair<std::string, std::string>> metadata3 = {
{"address_hash", CreateMetadataValueThatHashesToBackend(3)}};
const auto rpc_options = RpcOptions().set_metadata(std::move(metadata));
const auto rpc_options1 = RpcOptions().set_metadata(std::move(metadata1));
const auto rpc_options2 = RpcOptions().set_metadata(std::move(metadata2));
const auto rpc_options3 = RpcOptions().set_metadata(std::move(metadata3));
const auto rpc_options =
RpcOptions().set_metadata(std::move(metadata)).set_timeout_ms(5000);
const auto rpc_options1 =
RpcOptions().set_metadata(std::move(metadata1)).set_timeout_ms(5000);
const auto rpc_options2 =
RpcOptions().set_metadata(std::move(metadata2)).set_timeout_ms(5000);
const auto rpc_options3 =
RpcOptions().set_metadata(std::move(metadata3)).set_timeout_ms(5000);
WaitForBackend(DEBUG_LOCATION, 0, /*check_status=*/nullptr,
WaitForBackendOptions(), rpc_options);
WaitForBackend(DEBUG_LOCATION, 1, /*check_status=*/nullptr,
@ -423,10 +427,14 @@ TEST_P(RingHashTest, HeaderHashingWithRegexRewrite) {
{"address_hash", CreateMetadataValueThatHashesToBackend(2)}};
std::vector<std::pair<std::string, std::string>> metadata3 = {
{"address_hash", CreateMetadataValueThatHashesToBackend(3)}};
const auto rpc_options = RpcOptions().set_metadata(std::move(metadata));
const auto rpc_options1 = RpcOptions().set_metadata(std::move(metadata1));
const auto rpc_options2 = RpcOptions().set_metadata(std::move(metadata2));
const auto rpc_options3 = RpcOptions().set_metadata(std::move(metadata3));
const auto rpc_options =
RpcOptions().set_metadata(std::move(metadata)).set_timeout_ms(5000);
const auto rpc_options1 =
RpcOptions().set_metadata(std::move(metadata1)).set_timeout_ms(5000);
const auto rpc_options2 =
RpcOptions().set_metadata(std::move(metadata2)).set_timeout_ms(5000);
const auto rpc_options3 =
RpcOptions().set_metadata(std::move(metadata3)).set_timeout_ms(5000);
CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options);
CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options1);
CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options2);
@ -462,7 +470,7 @@ TEST_P(RingHashTest, NoHashPolicy) {
// TODO(donnadionne): remove extended timeout after ring creation
// optimization.
WaitForAllBackends(DEBUG_LOCATION, 0, 2, /*check_status=*/nullptr,
WaitForBackendOptions(),
WaitForBackendOptions().set_timeout_ms(kRpcTimeoutMs),
RpcOptions().set_timeout_ms(kRpcTimeoutMs));
CheckRpcSendOk(DEBUG_LOCATION, kNumRpcs);
const int request_count_1 = backends_[0]->backend_service()->request_count();
@ -503,7 +511,7 @@ TEST_P(RingHashTest, EndpointWeights) {
// TODO(donnadionne): remove extended timeout after ring creation
// optimization.
WaitForAllBackends(DEBUG_LOCATION, 0, 3, /*check_status=*/nullptr,
WaitForBackendOptions(),
WaitForBackendOptions().set_timeout_ms(kRpcTimeoutMs),
RpcOptions().set_timeout_ms(kRpcTimeoutMs));
CheckRpcSendOk(DEBUG_LOCATION, kNumRpcs);
// Endpoint 2 should see 50% of traffic, and endpoints 0 and 1 should
@ -539,7 +547,8 @@ TEST_P(RingHashTest, ContinuesPastTerminalPolicyThatDoesNotProduceResult) {
balancer_->ads_service()->SetEdsResource(BuildEdsResource(args));
std::vector<std::pair<std::string, std::string>> metadata = {
{"address_hash", CreateMetadataValueThatHashesToBackend(0)}};
const auto rpc_options = RpcOptions().set_metadata(std::move(metadata));
const auto rpc_options =
RpcOptions().set_metadata(std::move(metadata)).set_timeout_ms(5000);
CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options);
EXPECT_EQ(backends_[0]->backend_service()->request_count(), 100);
EXPECT_EQ(backends_[1]->backend_service()->request_count(), 0);
@ -575,7 +584,7 @@ TEST_P(RingHashTest, HashOnHeaderThatIsNotPresent) {
// TODO(donnadionne): remove extended timeout after ring creation
// optimization.
WaitForAllBackends(DEBUG_LOCATION, 0, 2, /*check_status=*/nullptr,
WaitForBackendOptions(),
WaitForBackendOptions().set_timeout_ms(kRpcTimeoutMs),
RpcOptions().set_timeout_ms(kRpcTimeoutMs));
CheckRpcSendOk(DEBUG_LOCATION, kNumRpcs, rpc_options);
const int request_count_1 = backends_[0]->backend_service()->request_count();
@ -618,7 +627,7 @@ TEST_P(RingHashTest, UnsupportedHashPolicyDefaultToRandomHashing) {
// TODO(donnadionne): remove extended timeout after ring creation
// optimization.
WaitForAllBackends(DEBUG_LOCATION, 0, 2, /*check_status=*/nullptr,
WaitForBackendOptions(),
WaitForBackendOptions().set_timeout_ms(kRpcTimeoutMs),
RpcOptions().set_timeout_ms(kRpcTimeoutMs));
CheckRpcSendOk(DEBUG_LOCATION, kNumRpcs);
const int request_count_1 = backends_[0]->backend_service()->request_count();
@ -655,7 +664,7 @@ TEST_P(RingHashTest, RandomHashingDistributionAccordingToEndpointWeight) {
// TODO(donnadionne): remove extended timeout after ring creation
// optimization.
WaitForAllBackends(DEBUG_LOCATION, 0, 2, /*check_status=*/nullptr,
WaitForBackendOptions(),
WaitForBackendOptions().set_timeout_ms(kRpcTimeoutMs),
RpcOptions().set_timeout_ms(kRpcTimeoutMs));
CheckRpcSendOk(DEBUG_LOCATION, kNumRpcs);
const int weight_33_request_count =
@ -695,7 +704,7 @@ TEST_P(RingHashTest,
// TODO(donnadionne): remove extended timeout after ring creation
// optimization.
WaitForAllBackends(DEBUG_LOCATION, 0, 2, /*check_status=*/nullptr,
WaitForBackendOptions(),
WaitForBackendOptions().set_timeout_ms(kRpcTimeoutMs),
RpcOptions().set_timeout_ms(kRpcTimeoutMs));
CheckRpcSendOk(DEBUG_LOCATION, kNumRpcs);
const int weight_20_request_count =
@ -731,7 +740,8 @@ TEST_P(RingHashTest, FixedHashingTerminalPolicy) {
{"fixed_string", "fixed_value"},
{"random_string", absl::StrFormat("%" PRIu32, rand())},
};
const auto rpc_options = RpcOptions().set_metadata(std::move(metadata));
const auto rpc_options =
RpcOptions().set_metadata(std::move(metadata)).set_timeout_ms(5000);
CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options);
bool found = false;
for (size_t i = 0; i < backends_.size(); ++i) {
@ -762,7 +772,7 @@ TEST_P(RingHashTest, IdleToReady) {
EdsResourceArgs args({{"locality0", CreateEndpointsForBackends()}});
balancer_->ads_service()->SetEdsResource(BuildEdsResource(args));
EXPECT_EQ(GRPC_CHANNEL_IDLE, channel_->GetState(false));
CheckRpcSendOk(DEBUG_LOCATION);
CheckRpcSendOk(DEBUG_LOCATION, 1, RpcOptions().set_timeout_ms(5000));
EXPECT_EQ(GRPC_CHANNEL_READY, channel_->GetState(false));
}
@ -915,7 +925,8 @@ TEST_P(RingHashTest, TransientFailureCheckNextOne) {
std::vector<std::pair<std::string, std::string>> metadata = {
{"address_hash",
CreateMetadataValueThatHashesToBackendPort(unused_port)}};
const auto rpc_options = RpcOptions().set_metadata(std::move(metadata));
const auto rpc_options =
RpcOptions().set_metadata(std::move(metadata)).set_timeout_ms(5000);
WaitForBackend(DEBUG_LOCATION, 0, /*check_status=*/nullptr,
WaitForBackendOptions(), rpc_options);
CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options);
@ -944,7 +955,8 @@ TEST_P(RingHashTest, SwitchToLowerPrioirtyAndThenBack) {
balancer_->ads_service()->SetEdsResource(BuildEdsResource(args));
std::vector<std::pair<std::string, std::string>> metadata = {
{"address_hash", CreateMetadataValueThatHashesToBackend(0)}};
const auto rpc_options = RpcOptions().set_metadata(std::move(metadata));
const auto rpc_options =
RpcOptions().set_metadata(std::move(metadata)).set_timeout_ms(5000);
WaitForBackend(DEBUG_LOCATION, 0, /*check_status=*/nullptr,
WaitForBackendOptions(), rpc_options);
backends_[0]->StopListeningAndSendGoaways();
@ -1133,7 +1145,7 @@ TEST_P(RingHashTest, UnsupportedHashPolicyUntilChannelIdHashing) {
new_route_config);
EdsResourceArgs args({{"locality0", CreateEndpointsForBackends()}});
balancer_->ads_service()->SetEdsResource(BuildEdsResource(args));
CheckRpcSendOk(DEBUG_LOCATION, 100);
CheckRpcSendOk(DEBUG_LOCATION, 100, RpcOptions().set_timeout_ms(5000));
bool found = false;
for (size_t i = 0; i < backends_.size(); ++i) {
if (backends_[i]->backend_service()->request_count() > 0) {

Write Preview
Loading…
Cancel
Save