diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index ff87d0ad68f..ae93553dbcf 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -25,7 +25,6 @@ EXPERIMENTS = { "rfc_max_concurrent_streams", ], "core_end2end_test": [ - "event_engine_listener", "promise_based_client_call", "promise_based_server_call", "work_serializer_dispatch", @@ -38,9 +37,6 @@ EXPERIMENTS = { "tcp_frame_size_tuning", "tcp_rcv_lowat", ], - "event_engine_listener_test": [ - "event_engine_listener", - ], "flow_control_test": [ "multiping", "peer_state_based_framing", @@ -73,6 +69,9 @@ EXPERIMENTS = { "block_excessive_requests_before_settings_ack", "tarpit", ], + "core_end2end_test": [ + "event_engine_listener", + ], "cpp_end2end_test": [ "chttp2_batch_requests", "chttp2_offload_on_rst_stream", @@ -82,6 +81,9 @@ EXPERIMENTS = { "round_robin_delegate_to_pick_first", "wrr_delegate_to_pick_first", ], + "event_engine_listener_test": [ + "event_engine_listener", + ], "flow_control_test": [ "chttp2_batch_requests", "chttp2_offload_on_rst_stream", @@ -113,7 +115,6 @@ EXPERIMENTS = { "rfc_max_concurrent_streams", ], "core_end2end_test": [ - "event_engine_listener", "promise_based_client_call", "promise_based_server_call", "work_serializer_dispatch", @@ -126,9 +127,6 @@ EXPERIMENTS = { "tcp_frame_size_tuning", "tcp_rcv_lowat", ], - "event_engine_listener_test": [ - "event_engine_listener", - ], "flow_control_test": [ "multiping", "peer_state_based_framing", diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index a493e49ed2b..2b4afe9f905 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -505,7 +505,7 @@ const ExperimentMetadata g_experiment_metadata[] = { {"event_engine_dns", description_event_engine_dns, additional_constraints_event_engine_dns, false, false}, {"event_engine_listener", description_event_engine_listener, - additional_constraints_event_engine_listener, false, true}, + additional_constraints_event_engine_listener, true, true}, {"free_large_allocator", description_free_large_allocator, additional_constraints_free_large_allocator, false, true}, {"keepalive_fix", description_keepalive_fix, diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index a3baeea17ec..f58c86cd57a 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -156,7 +156,8 @@ inline bool IsClientPrivacyEnabled() { return false; } inline bool IsCombinerOffloadToEventEngineEnabled() { return true; } inline bool IsEventEngineClientEnabled() { return false; } inline bool IsEventEngineDnsEnabled() { return false; } -inline bool IsEventEngineListenerEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER +inline bool IsEventEngineListenerEnabled() { return true; } inline bool IsFreeLargeAllocatorEnabled() { return false; } inline bool IsKeepaliveFixEnabled() { return false; } inline bool IsKeepaliveServerFixEnabled() { return false; } diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml index b783c00ba41..a7c999f3c02 100644 --- a/src/core/lib/experiments/rollouts.yaml +++ b/src/core/lib/experiments/rollouts.yaml @@ -69,7 +69,11 @@ # implemented windows: broken - name: event_engine_listener - default: false + default: + # not tested on iOS at all + ios: broken + posix: false + windows: true - name: free_large_allocator default: false - name: jitter_max_idle