From a79a8111af512d2013b50521928205c279a60df2 Mon Sep 17 00:00:00 2001 From: Yijie Ma Date: Mon, 20 May 2024 12:09:37 -0700 Subject: [PATCH] [EventEngine] Enable the EventEngine DNS Resolver on Windows (#36286) Closes #36286 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36286 from yijiem:enable-win-ee-dns 9276c47326383dd60f78d8c20f66ab048f1e928a PiperOrigin-RevId: 635531420 --- bazel/experiments.bzl | 6 ++++++ src/core/lib/experiments/experiments.cc | 2 +- src/core/lib/experiments/experiments.h | 3 ++- src/core/lib/experiments/rollouts.yaml | 4 +--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index 013e8ae208a..e3aeb05464d 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -74,6 +74,9 @@ EXPERIMENTS = { ], }, "on": { + "cancel_ares_query_test": [ + "event_engine_dns", + ], "core_end2end_test": [ "event_engine_client", "event_engine_listener", @@ -90,6 +93,9 @@ EXPERIMENTS = { "lb_unit_test": [ "pick_first_new", ], + "resolver_component_tests_runner_invoker": [ + "event_engine_dns", + ], "xds_end2end_test": [ "pick_first_new", ], diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index a8996e8e124..468884ec583 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -328,7 +328,7 @@ const ExperimentMetadata g_experiment_metadata[] = { {"event_engine_client", description_event_engine_client, additional_constraints_event_engine_client, nullptr, 0, true, true}, {"event_engine_dns", description_event_engine_dns, - additional_constraints_event_engine_dns, nullptr, 0, false, false}, + additional_constraints_event_engine_dns, nullptr, 0, true, false}, {"event_engine_listener", description_event_engine_listener, additional_constraints_event_engine_listener, nullptr, 0, true, true}, {"free_large_allocator", description_free_large_allocator, diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index db7c9664bcd..9e3ba9148ba 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -99,7 +99,8 @@ inline bool IsCanaryClientPrivacyEnabled() { return false; } inline bool IsClientPrivacyEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT inline bool IsEventEngineClientEnabled() { return true; } -inline bool IsEventEngineDnsEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS +inline bool IsEventEngineDnsEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER inline bool IsEventEngineListenerEnabled() { return true; } inline bool IsFreeLargeAllocatorEnabled() { return false; } diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml index 97018a672cd..7187f8c2952 100644 --- a/src/core/lib/experiments/rollouts.yaml +++ b/src/core/lib/experiments/rollouts.yaml @@ -64,9 +64,7 @@ # not tested on iOS at all ios: broken posix: true - # TODO(yijiem): resolve when the WindowsEventEngine DNS Resolver is - # implemented - windows: broken + windows: true - name: event_engine_listener default: # not tested on iOS at all