From 6cd53e1c80bbf5d4a5ca16cd3e1231304c792f05 Mon Sep 17 00:00:00 2001 From: AJ Heller Date: Mon, 5 Feb 2024 16:56:39 -0800 Subject: [PATCH] [experiment] Disable Posix EventEngine Client experiment (#35819) Disabling before the 1.62 branch cut. There is a flake in one specific interop test: cloud_to_prod_auth:c++:*:oauth2_auth_token:tls, with * being default or gateway_v4. There is also an unresolved PHP crash on test shutdown, just debug builds on Mac (not Linux or Windows). Closes #35819 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35819 from drfloob:disable-posix-ee-client c42e8b8c20bbd601ec7a344ffcee047fd2a9a908 PiperOrigin-RevId: 604474559 --- bazel/experiments.bzl | 8 ++++---- src/core/lib/experiments/experiments.cc | 2 +- src/core/lib/experiments/experiments.h | 3 +-- src/core/lib/experiments/rollouts.yaml | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index ca5894b6010..20e4cafde00 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -231,6 +231,7 @@ EXPERIMENTS = { "v3_compression_filter", ], "core_end2end_test": [ + "event_engine_client", "promise_based_client_call", "promise_based_server_call", "work_serializer_dispatch", @@ -243,6 +244,9 @@ EXPERIMENTS = { "tcp_frame_size_tuning", "tcp_rcv_lowat", ], + "event_engine_client_test": [ + "event_engine_client", + ], "flow_control_test": [ "multiping", "peer_state_based_framing", @@ -273,7 +277,6 @@ EXPERIMENTS = { }, "on": { "core_end2end_test": [ - "event_engine_client", "event_engine_listener", ], "cpp_lb_end2end_test": [ @@ -281,9 +284,6 @@ EXPERIMENTS = { "round_robin_delegate_to_pick_first", "wrr_delegate_to_pick_first", ], - "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 38eaf479058..da148ce2b08 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -725,7 +725,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, false, 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 f7d214fa8e9..606c680d087 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -195,8 +195,7 @@ inline bool IsCanaryClientPrivacyEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS inline bool IsClientIdlenessEnabled() { return true; } inline bool IsClientPrivacyEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT -inline bool IsEventEngineClientEnabled() { return true; } +inline bool IsEventEngineClientEnabled() { return false; } inline bool IsEventEngineDnsEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER inline bool IsEventEngineListenerEnabled() { return true; } diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml index 8c9e77b36d3..26e77b8f800 100644 --- a/src/core/lib/experiments/rollouts.yaml +++ b/src/core/lib/experiments/rollouts.yaml @@ -54,7 +54,7 @@ default: # not tested on iOS at all ios: broken - posix: true + posix: false # TODO(hork): resolve when the client end2end test flake rate reduces to # a tolerable amount. windows: broken