0001-Revert-Revert-c-ares-as-the-default-resolvre.patch

From f0fac89f20340593fdc586cf768cec69bcb20003 Mon Sep 17 00:00:00 2001
From: Alexander Polcyn <[email protected]>
Date: Thu, 31 Jan 2019 15:06:34 -0800
Subject: [PATCH] Revert "Revert c-ares as the default resolvre"

This reverts commit ca30b2240f6f8e86b51452097c3cb43c5d4f7117.
---
 .../filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc  | 3 ++-
 templates/test/cpp/naming/resolver_component_tests_defs.include      | 1 -
 test/core/client_channel/resolvers/dns_resolver_test.cc              | 5 ++++-
 test/cpp/naming/resolver_component_tests_runner.py                   | 1 -
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
index abacd0c960..4c114d3b3c 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
@@ -472,7 +472,8 @@ static grpc_address_resolver_vtable ares_resolver = {
     grpc_resolve_address_ares, blocking_resolve_address_ares};

 static bool should_use_ares(const char* resolver_env) {
-  return resolver_env != nullptr && gpr_stricmp(resolver_env, "ares") == 0;
+  return resolver_env == nullptr || strlen(resolver_env) == 0 ||
+         gpr_stricmp(resolver_env, "ares") == 0;
 }

 void grpc_resolver_dns_ares_init() {
diff --git a/templates/test/cpp/naming/resolver_component_tests_defs.include b/templates/test/cpp/naming/resolver_component_tests_defs.include
index b34845e01a..d38316cbe6 100644
--- a/templates/test/cpp/naming/resolver_component_tests_defs.include
+++ b/templates/test/cpp/naming/resolver_component_tests_defs.include
@@ -55,7 +55,6 @@ if cur_resolver and cur_resolver != 'ares':
       'needs to use GRPC_DNS_RESOLVER=ares.'))
   test_runner_log('Exit 1 without running tests.')
   sys.exit(1)
-os.environ.update({'GRPC_DNS_RESOLVER': 'ares'})
 os.environ.update({'GRPC_TRACE': 'cares_resolver'})

 def wait_until_dns_server_is_up(args,
diff --git a/test/core/client_channel/resolvers/dns_resolver_test.cc b/test/core/client_channel/resolvers/dns_resolver_test.cc
index 571746abe8..3f9e1f42b1 100644
--- a/test/core/client_channel/resolvers/dns_resolver_test.cc
+++ b/test/core/client_channel/resolvers/dns_resolver_test.cc
@@ -72,7 +72,10 @@ int main(int argc, char** argv) {
   test_succeeds(dns, "dns:10.2.1.1:1234");
   test_succeeds(dns, "dns:www.google.com");
   test_succeeds(dns, "dns:///www.google.com");
-  if (grpc_resolve_address == grpc_resolve_address_ares) {
+  char* resolver_env = gpr_getenv("GRPC_DNS_RESOLVER");
+  if (resolver_env != nullptr && gpr_stricmp(resolver_env, "native") == 0) {
+    test_fails(dns, "dns://8.8.8.8/8.8.8.8:8888");
+  } else {
     test_succeeds(dns, "dns://8.8.8.8/8.8.8.8:8888");
   } else {
     test_fails(dns, "dns://8.8.8.8/8.8.8.8:8888");
diff --git a/test/cpp/naming/resolver_component_tests_runner.py b/test/cpp/naming/resolver_component_tests_runner.py
index 1873eec35b..950a9d4897 100755
--- a/test/cpp/naming/resolver_component_tests_runner.py
+++ b/test/cpp/naming/resolver_component_tests_runner.py
@@ -55,7 +55,6 @@ if cur_resolver and cur_resolver != 'ares':
       'needs to use GRPC_DNS_RESOLVER=ares.'))
   test_runner_log('Exit 1 without running tests.')
   sys.exit(1)
-os.environ.update({'GRPC_DNS_RESOLVER': 'ares'})
 os.environ.update({'GRPC_TRACE': 'cares_resolver'})

 def wait_until_dns_server_is_up(args,
--
2.14.3 (Apple Git-98)

arrow-memory-0.14.0.jar