diff options
| author |  apolcyn <apolcyn@google.com> | 2018-11-30 16:58:16 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-11-30 16:58:16 -0800 |
| commit | 5fed8e54528ca94213fec7038f56d9db91709c33 (patch) | |
| tree | 07308d68e04e6e67f79b5c7adb360f677c8fdbdc /test/core/client_channel | |
| parent | 09add58ecaec113c652cb2ad6283b51c0bfb4948 (diff) | |
| parent | b203ed3c071361826f3b24d940e6bfa1c3d19f81 (diff) | |
Merge pull request #17354 from apolcyn/fix_ares_deadlocks
Cancel c-ares queries after a timeout to avoid getting stuck
Diffstat (limited to 'test/core/client_channel')
| -rw-r--r-- | test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc | 2 | ||||
| -rw-r--r-- | test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc index 12c66ad2a5..76769b2b64 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc @@ -64,7 +64,7 @@ static grpc_ares_request* my_dns_lookup_ares_locked( const char* dns_server, const char* addr, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_lb_addresses** lb_addrs, bool check_grpclb, char** service_config_json, - grpc_combiner* combiner) { + int query_timeout_ms, grpc_combiner* combiner) { gpr_mu_lock(&g_mu); GPR_ASSERT(0 == strcmp("test", addr)); grpc_error* error = GRPC_ERROR_NONE; diff --git a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc index 4fbecea121..cdbe33dbe7 100644 --- a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc @@ -41,7 +41,7 @@ static grpc_ares_request* (*g_default_dns_lookup_ares_locked)( const char* dns_server, const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_lb_addresses** addrs, bool check_grpclb, char** service_config_json, - grpc_combiner* combiner); + int query_timeout_ms, grpc_combiner* combiner); // Counter incremented by test_resolve_address_impl indicating the number of // times a system-level resolution has happened. @@ -91,10 +91,10 @@ static grpc_ares_request* test_dns_lookup_ares_locked( const char* dns_server, const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_lb_addresses** addrs, bool check_grpclb, char** service_config_json, - grpc_combiner* combiner) { + int query_timeout_ms, grpc_combiner* combiner) { grpc_ares_request* result = g_default_dns_lookup_ares_locked( dns_server, name, default_port, g_iomgr_args.pollset_set, on_done, addrs, - check_grpclb, service_config_json, combiner); + check_grpclb, service_config_json, query_timeout_ms, combiner); ++g_resolution_count; static grpc_millis last_resolution_time = 0; if (last_resolution_time == 0) { |