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

[fixit] Core End2End Tests: Increase the connect timeout (#30590)

Browse Source 
* [fixit] Connectivity: Increase the connect timeout

* Remove old arg

* Fix max_connection_idle and simple_delayed_request as well

* Fix goaway_server_test too

* Use new API

* Fix IWYU
pull/30609/head
Yash Tibrewal 3 years ago committed by GitHub
parent 3817db13b6
commit 17315e1faf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 56 additions and 62 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. 33
      test/core/end2end/goaway_server_test.cc
  2. 29
      test/core/end2end/tests/connectivity.cc
  3. 18
      test/core/end2end/tests/max_connection_idle.cc
  4. 38
      test/core/end2end/tests/simple_delayed_request.cc

33
test/core/end2end/goaway_server_test.cc
Unescape View File

@ -247,28 +247,23 @@ int main(int argc, char** argv) {
std::string addr; std::string addr;
grpc_channel_args client_args; auto client_args =
grpc_arg arg_array[2]; grpc_core::ChannelArgs()
arg_array[0].type = GRPC_ARG_INTEGER; .Set(GRPC_ARG_INITIAL_RECONNECT_BACKOFF_MS, 1000)
arg_array[0].key = .Set(GRPC_ARG_MAX_RECONNECT_BACKOFF_MS, 1000)
const_cast<char*>("grpc.testing.fixed_reconnect_backoff_ms"); .Set(GRPC_ARG_MIN_RECONNECT_BACKOFF_MS, 5000)
arg_array[0].value.integer = 1000; /* When this test brings down server1 and then brings up server2,
/* When this test brings down server1 and then brings up server2, * the targetted server port number changes, and the client channel
* the targetted server port number changes, and the client channel * needs to re-resolve to pick this up. This test requires that
* needs to re-resolve to pick this up. This test requires that * happen within 10 seconds, but gRPC's DNS resolvers rate limit
* happen within 10 seconds, but gRPC's DNS resolvers rate limit * resolution attempts to at most once every 30 seconds by default.
* resolution attempts to at most once every 30 seconds by default. * So we tweak it for this test. */
* So we tweak it for this test. */ .Set(GRPC_ARG_DNS_MIN_TIME_BETWEEN_RESOLUTIONS_MS, 1000)
arg_array[1].type = GRPC_ARG_INTEGER; .ToC();
arg_array[1].key =
const_cast<char*>(GRPC_ARG_DNS_MIN_TIME_BETWEEN_RESOLUTIONS_MS);
arg_array[1].value.integer = 1000;
client_args.args = arg_array;
client_args.num_args = 2;
/* create a channel that picks first amongst the servers */ /* create a channel that picks first amongst the servers */
grpc_channel_credentials* creds = grpc_insecure_credentials_create(); grpc_channel_credentials* creds = grpc_insecure_credentials_create();
grpc_channel* chan = grpc_channel_create("test", creds, &client_args); grpc_channel* chan = grpc_channel_create("test", creds, client_args.get());
grpc_channel_credentials_release(creds); grpc_channel_credentials_release(creds);
/* and an initial call to them */ /* and an initial call to them */
grpc_slice host = grpc_slice_from_static_string("127.0.0.1"); grpc_slice host = grpc_slice_from_static_string("127.0.0.1");

29
test/core/end2end/tests/connectivity.cc
Unescape View File

@ -18,12 +18,16 @@
#include <stdint.h> #include <stdint.h>
#include <memory>
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/sync.h> #include <grpc/support/sync.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/gprpp/thd.h"
#include "src/core/lib/gprpp/time.h"
#include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/cq_verifier.h"
#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/end2end_tests.h"
#include "test/core/util/test_config.h" #include "test/core/util/test_config.h"
@ -65,16 +69,13 @@ static void test_connectivity(grpc_end2end_test_config config) {
grpc_core::CqVerifier cqv(f.cq); grpc_core::CqVerifier cqv(f.cq);
child_events ce; child_events ce;
grpc_channel_args client_args; auto client_args = grpc_core::ChannelArgs()
grpc_arg arg_array[1]; .Set(GRPC_ARG_INITIAL_RECONNECT_BACKOFF_MS, 1000)
arg_array[0].type = GRPC_ARG_INTEGER; .Set(GRPC_ARG_MAX_RECONNECT_BACKOFF_MS, 1000)
arg_array[0].key = .Set(GRPC_ARG_MIN_RECONNECT_BACKOFF_MS, 5000)
const_cast<char*>("grpc.testing.fixed_reconnect_backoff_ms"); .ToC();
arg_array[0].value.integer = 1000;
client_args.args = arg_array;
client_args.num_args = 1;
config.init_client(&f, &client_args); config.init_client(&f, client_args.get());
ce.channel = f.client; ce.channel = f.client;
ce.cq = f.cq; ce.cq = f.cq;
@ -104,7 +105,7 @@ static void test_connectivity(grpc_end2end_test_config config) {
GRPC_CHANNEL_IDLE); GRPC_CHANNEL_IDLE);
/* start watching for a change */ /* start watching for a change */
grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_IDLE, grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_IDLE,
grpc_timeout_seconds_to_deadline(3), grpc_timeout_seconds_to_deadline(10),
f.cq, tag(2)); f.cq, tag(2));
/* and now the watch should trigger */ /* and now the watch should trigger */
@ -116,7 +117,7 @@ static void test_connectivity(grpc_end2end_test_config config) {
/* quickly followed by a transition to TRANSIENT_FAILURE */ /* quickly followed by a transition to TRANSIENT_FAILURE */
grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_CONNECTING, grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_CONNECTING,
grpc_timeout_seconds_to_deadline(3), grpc_timeout_seconds_to_deadline(10),
f.cq, tag(3)); f.cq, tag(3));
cqv.Expect(tag(3), true); cqv.Expect(tag(3), true);
cqv.Verify(); cqv.Verify();
@ -135,9 +136,9 @@ static void test_connectivity(grpc_end2end_test_config config) {
READY is reached */ READY is reached */
while (state != GRPC_CHANNEL_READY) { while (state != GRPC_CHANNEL_READY) {
grpc_channel_watch_connectivity_state( grpc_channel_watch_connectivity_state(
f.client, state, grpc_timeout_seconds_to_deadline(3), f.cq, tag(4)); f.client, state, grpc_timeout_seconds_to_deadline(10), f.cq, tag(4));
cqv.Expect(tag(4), true); cqv.Expect(tag(4), true);
cqv.Verify(); cqv.Verify(grpc_core::Duration::Seconds(20));
state = grpc_channel_check_connectivity_state(f.client, 0); state = grpc_channel_check_connectivity_state(f.client, 0);
GPR_ASSERT(state == GRPC_CHANNEL_READY || GPR_ASSERT(state == GRPC_CHANNEL_READY ||
state == GRPC_CHANNEL_CONNECTING || state == GRPC_CHANNEL_CONNECTING ||
@ -149,7 +150,7 @@ static void test_connectivity(grpc_end2end_test_config config) {
gpr_log(GPR_DEBUG, "*** SHUTTING DOWN SERVER ***"); gpr_log(GPR_DEBUG, "*** SHUTTING DOWN SERVER ***");
grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_READY, grpc_channel_watch_connectivity_state(f.client, GRPC_CHANNEL_READY,
grpc_timeout_seconds_to_deadline(3), grpc_timeout_seconds_to_deadline(10),
f.cq, tag(5)); f.cq, tag(5));
grpc_server_shutdown_and_notify(f.server, f.cq, tag(0xdead)); grpc_server_shutdown_and_notify(f.server, f.cq, tag(0xdead));

18
test/core/end2end/tests/max_connection_idle.cc
Unescape View File

@ -19,6 +19,8 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <memory>
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/impl/codegen/propagation_bits.h> #include <grpc/impl/codegen/propagation_bits.h>
#include <grpc/slice.h> #include <grpc/slice.h>
@ -26,6 +28,7 @@
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gpr/useful.h" #include "src/core/lib/gpr/useful.h"
#include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/cq_verifier.h"
#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/end2end_tests.h"
@ -168,11 +171,11 @@ static void test_max_connection_idle(grpc_end2end_test_config config) {
grpc_connectivity_state state = GRPC_CHANNEL_IDLE; grpc_connectivity_state state = GRPC_CHANNEL_IDLE;
grpc_core::CqVerifier cqv(f.cq); grpc_core::CqVerifier cqv(f.cq);
grpc_arg client_a[1]; auto client_args = grpc_core::ChannelArgs()
client_a[0].type = GRPC_ARG_INTEGER; .Set(GRPC_ARG_INITIAL_RECONNECT_BACKOFF_MS, 1000)
client_a[0].key = .Set(GRPC_ARG_MAX_RECONNECT_BACKOFF_MS, 1000)
const_cast<char*>("grpc.testing.fixed_reconnect_backoff_ms"); .Set(GRPC_ARG_MIN_RECONNECT_BACKOFF_MS, 5000)
client_a[0].value.integer = 1000; .ToC();
grpc_arg server_a[2]; grpc_arg server_a[2];
server_a[0].type = GRPC_ARG_INTEGER; server_a[0].type = GRPC_ARG_INTEGER;
server_a[0].key = const_cast<char*>(GRPC_ARG_MAX_CONNECTION_IDLE_MS); server_a[0].key = const_cast<char*>(GRPC_ARG_MAX_CONNECTION_IDLE_MS);
@ -180,10 +183,9 @@ static void test_max_connection_idle(grpc_end2end_test_config config) {
server_a[1].type = GRPC_ARG_INTEGER; server_a[1].type = GRPC_ARG_INTEGER;
server_a[1].key = const_cast<char*>(GRPC_ARG_MAX_CONNECTION_AGE_MS); server_a[1].key = const_cast<char*>(GRPC_ARG_MAX_CONNECTION_AGE_MS);
server_a[1].value.integer = MAX_CONNECTION_AGE_MS; server_a[1].value.integer = MAX_CONNECTION_AGE_MS;
grpc_channel_args client_args = {GPR_ARRAY_SIZE(client_a), client_a};
grpc_channel_args server_args = {GPR_ARRAY_SIZE(server_a), server_a}; grpc_channel_args server_args = {GPR_ARRAY_SIZE(server_a), server_a};
config.init_client(&f, &client_args); config.init_client(&f, client_args.get());
config.init_server(&f, &server_args); config.init_server(&f, &server_args);
/* check that we're still in idle, and start connecting */ /* check that we're still in idle, and start connecting */
@ -193,7 +195,7 @@ static void test_max_connection_idle(grpc_end2end_test_config config) {
READY is reached */ READY is reached */
while (state != GRPC_CHANNEL_READY) { while (state != GRPC_CHANNEL_READY) {
grpc_channel_watch_connectivity_state( grpc_channel_watch_connectivity_state(
f.client, state, grpc_timeout_seconds_to_deadline(3), f.cq, tag(99)); f.client, state, grpc_timeout_seconds_to_deadline(10), f.cq, tag(99));
cqv.Expect(tag(99), true); cqv.Expect(tag(99), true);
cqv.Verify(); cqv.Verify();
state = grpc_channel_check_connectivity_state(f.client, 0); state = grpc_channel_check_connectivity_state(f.client, 0);

38
test/core/end2end/tests/simple_delayed_request.cc
Unescape View File

@ -19,12 +19,15 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <memory>
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/impl/codegen/propagation_bits.h> #include <grpc/impl/codegen/propagation_bits.h>
#include <grpc/slice.h> #include <grpc/slice.h>
#include <grpc/status.h> #include <grpc/status.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/core/lib/channel/channel_args.h"
#include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/cq_verifier.h"
#include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/end2end_tests.h"
#include "test/core/util/test_config.h" #include "test/core/util/test_config.h"
@ -75,8 +78,8 @@ static void end_test(grpc_end2end_test_fixture* f) {
static void simple_delayed_request_body(grpc_end2end_test_config config, static void simple_delayed_request_body(grpc_end2end_test_config config,
grpc_end2end_test_fixture* f, grpc_end2end_test_fixture* f,
grpc_channel_args* client_args, const grpc_channel_args* client_args,
grpc_channel_args* server_args, const grpc_channel_args* server_args,
long /*delay_us*/) { long /*delay_us*/) {
grpc_call* c; grpc_call* c;
grpc_call* s; grpc_call* s;
@ -185,40 +188,33 @@ static void simple_delayed_request_body(grpc_end2end_test_config config,
static void test_simple_delayed_request_short(grpc_end2end_test_config config) { static void test_simple_delayed_request_short(grpc_end2end_test_config config) {
grpc_end2end_test_fixture f; grpc_end2end_test_fixture f;
grpc_channel_args client_args; auto client_args = grpc_core::ChannelArgs()
grpc_arg arg_array[1]; .Set(GRPC_ARG_INITIAL_RECONNECT_BACKOFF_MS, 1000)
arg_array[0].type = GRPC_ARG_INTEGER; .Set(GRPC_ARG_MAX_RECONNECT_BACKOFF_MS, 1000)
arg_array[0].key = .Set(GRPC_ARG_MIN_RECONNECT_BACKOFF_MS, 5000)
const_cast<char*>("grpc.testing.fixed_reconnect_backoff_ms"); .ToC();
arg_array[0].value.integer = 1000;
client_args.args = arg_array;
client_args.num_args = 1;
gpr_log(GPR_INFO, "Running test: %s/%s", "test_simple_delayed_request_short", gpr_log(GPR_INFO, "Running test: %s/%s", "test_simple_delayed_request_short",
config.name); config.name);
f = config.create_fixture(nullptr, nullptr); f = config.create_fixture(nullptr, nullptr);
simple_delayed_request_body(config, &f, &client_args, nullptr, 100000); simple_delayed_request_body(config, &f, client_args.get(), nullptr, 100000);
end_test(&f); end_test(&f);
config.tear_down_data(&f); config.tear_down_data(&f);
} }
static void test_simple_delayed_request_long(grpc_end2end_test_config config) { static void test_simple_delayed_request_long(grpc_end2end_test_config config) {
grpc_end2end_test_fixture f; grpc_end2end_test_fixture f;
grpc_channel_args client_args; auto client_args = grpc_core::ChannelArgs()
grpc_arg arg_array[1]; .Set(GRPC_ARG_INITIAL_RECONNECT_BACKOFF_MS, 1000)
arg_array[0].type = GRPC_ARG_INTEGER; .Set(GRPC_ARG_MAX_RECONNECT_BACKOFF_MS, 1000)
arg_array[0].key = .Set(GRPC_ARG_MIN_RECONNECT_BACKOFF_MS, 5000)
const_cast<char*>("grpc.testing.fixed_reconnect_backoff_ms"); .ToC();
arg_array[0].value.integer = 1000;
client_args.args = arg_array;
client_args.num_args = 1;
gpr_log(GPR_INFO, "Running test: %s/%s", "test_simple_delayed_request_long", gpr_log(GPR_INFO, "Running test: %s/%s", "test_simple_delayed_request_long",
config.name); config.name);
f = config.create_fixture(nullptr, nullptr); f = config.create_fixture(nullptr, nullptr);
/* This timeout should be longer than a single retry */ /* This timeout should be longer than a single retry */
simple_delayed_request_body(config, &f, &client_args, nullptr, 1500000); simple_delayed_request_body(config, &f, client_args.get(), nullptr, 1500000);
end_test(&f); end_test(&f);
config.tear_down_data(&f); config.tear_down_data(&f);
} }

Write Preview
Loading…
Cancel
Save