From a7283ac6fe06ff50b5c7ebaf77b55ac7d9406a19 Mon Sep 17 00:00:00 2001 From: AJ Heller Date: Tue, 28 May 2024 16:48:13 -0700 Subject: [PATCH] [EventEngine] Disable Windows client (#36744) Rare endpoint shutdown races identified, about 1 in 10k tests have issues. Closes #36744 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36744 from drfloob:ugh 65a053fc1309ce7fa87e81d6953b4599431cde6b PiperOrigin-RevId: 638070081 --- bazel/experiments.bzl | 10 ++++++---- src/core/lib/experiments/experiments.cc | 2 +- src/core/lib/experiments/experiments.h | 3 +-- src/core/lib/experiments/rollouts.yaml | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index e3aeb05464d..053677378a6 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -57,10 +57,16 @@ EXPERIMENTS = { "dbg": { }, "off": { + "core_end2end_test": [ + "event_engine_client", + ], "endpoint_test": [ "tcp_frame_size_tuning", "tcp_rcv_lowat", ], + "event_engine_client_test": [ + "event_engine_client", + ], "flow_control_test": [ "multiping", "peer_state_based_framing", @@ -78,15 +84,11 @@ EXPERIMENTS = { "event_engine_dns", ], "core_end2end_test": [ - "event_engine_client", "event_engine_listener", ], "cpp_lb_end2end_test": [ "pick_first_new", ], - "event_engine_client_test": [ - "event_engine_client", - ], "event_engine_listener_test": [ "event_engine_listener", ], diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index 468884ec583..f54990cac18 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -326,7 +326,7 @@ const ExperimentMetadata g_experiment_metadata[] = { {"client_privacy", description_client_privacy, additional_constraints_client_privacy, nullptr, 0, false, false}, {"event_engine_client", description_event_engine_client, - additional_constraints_event_engine_client, nullptr, 0, true, true}, + additional_constraints_event_engine_client, nullptr, 0, false, true}, {"event_engine_dns", description_event_engine_dns, additional_constraints_event_engine_dns, nullptr, 0, true, false}, {"event_engine_listener", description_event_engine_listener, diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index 9e3ba9148ba..999ee24a8ed 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -97,8 +97,7 @@ inline bool IsCallStatusOverrideOnCancellationEnabled() { return true; } inline bool IsCallV3Enabled() { return false; } 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 IsEventEngineClientEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS inline bool IsEventEngineDnsEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml index 7187f8c2952..65d35a1bd4e 100644 --- a/src/core/lib/experiments/rollouts.yaml +++ b/src/core/lib/experiments/rollouts.yaml @@ -58,7 +58,7 @@ # not tested on iOS at all ios: broken posix: false - windows: true + windows: false - name: event_engine_dns default: # not tested on iOS at all