From 86d90f54b0ec6404e4142b4689e0f2a34057256e Mon Sep 17 00:00:00 2001 From: Yijie Ma Date: Fri, 8 Dec 2023 09:45:07 -0800 Subject: [PATCH] [EventEngine] Skip `dns_resolver_cooldown_test` for `event_engine_dns` experiment (#35251) Closes #35251 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35251 from yijiem:fix-dns-resolver-cooldown-test 857835200a1d9d4c02102cc8caa91d4c2366300c PiperOrigin-RevId: 589159895 --- src/core/lib/event_engine/posix_engine/posix_engine.cc | 2 +- src/core/lib/event_engine/posix_engine/posix_engine.h | 2 +- .../resolvers/dns_resolver_cooldown_test.cc | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.cc b/src/core/lib/event_engine/posix_engine/posix_engine.cc index dad5bd03a6c..a5a4ee1b40f 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine.cc @@ -552,7 +552,7 @@ void PosixEventEngine::PosixDNSResolver::LookupTXT(LookupTXTCallback on_resolve, absl::StatusOr> PosixEventEngine::GetDNSResolver( - const EventEngine::DNSResolver::ResolverOptions& options) { + GRPC_UNUSED const EventEngine::DNSResolver::ResolverOptions& options) { #ifndef GRPC_POSIX_SOCKET_RESOLVE_ADDRESS grpc_core::Crash("Unable to get DNS resolver for this platform."); #else // GRPC_POSIX_SOCKET_RESOLVE_ADDRESS diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.h b/src/core/lib/event_engine/posix_engine/posix_engine.h index e38479854e0..c025d46c6c8 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine.h @@ -198,7 +198,7 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport, bool CancelConnect(ConnectionHandle handle) override; bool IsWorkerThread() override; absl::StatusOr> GetDNSResolver( - const DNSResolver::ResolverOptions& options) override; + GRPC_UNUSED const DNSResolver::ResolverOptions& options) override; void Run(Closure* closure) override; void Run(absl::AnyInvocable closure) override; // Caution!! The timer implementation cannot create any fds. See #20418. 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 fc663837a8b..08f7e161a8f 100644 --- a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc @@ -42,6 +42,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" +#include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/gprpp/notification.h" @@ -409,6 +410,14 @@ static void test_cooldown() { } TEST(DnsResolverCooldownTest, MainTest) { + // TODO(yijiem): This test tests the cooldown behavior of the PollingResolver + // interface. To do that, it overrides the grpc_dns_lookup_hostname_ares + // function and overrides the iomgr's g_dns_resolver system. We would need to + // rewrite this test for EventEngine using a custom EE DNSResolver or adding + // to the resolver_fuzzer. + if (grpc_core::IsEventEngineDnsEnabled()) { + GTEST_SKIP() << "Not with event engine dns"; + } grpc_init(); auto work_serializer = std::make_shared(