diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index ad0a7b45f647f..682cbebe9f59f 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -68,7 +68,6 @@ EXPERIMENTS = { "local_connector_secure", "posix_ee_skip_grpc_init", "retry_in_callv3", - "server_listener", ], "cpp_end2end_test": [ "posix_ee_skip_grpc_init", @@ -86,9 +85,6 @@ EXPERIMENTS = { "free_large_allocator", "unconstrained_max_quota_buffer_size", ], - "xds_end2end_test": [ - "server_listener", - ], }, "on": { "cancel_ares_query_test": [ @@ -97,6 +93,7 @@ EXPERIMENTS = { "core_end2end_test": [ "event_engine_client", "event_engine_listener", + "server_listener", "work_serializer_dispatch", ], "cpp_end2end_test": [ @@ -120,6 +117,7 @@ EXPERIMENTS = { ], "xds_end2end_test": [ "pick_first_new", + "server_listener", "work_serializer_dispatch", ], }, @@ -134,7 +132,6 @@ EXPERIMENTS = { "local_connector_secure", "posix_ee_skip_grpc_init", "retry_in_callv3", - "server_listener", ], "cpp_end2end_test": [ "posix_ee_skip_grpc_init", @@ -152,12 +149,10 @@ EXPERIMENTS = { "free_large_allocator", "unconstrained_max_quota_buffer_size", ], - "xds_end2end_test": [ - "server_listener", - ], }, "on": { "core_end2end_test": [ + "server_listener", "work_serializer_dispatch", ], "cpp_end2end_test": [ @@ -172,6 +167,7 @@ EXPERIMENTS = { ], "xds_end2end_test": [ "pick_first_new", + "server_listener", "work_serializer_dispatch", ], }, @@ -186,7 +182,6 @@ EXPERIMENTS = { "local_connector_secure", "posix_ee_skip_grpc_init", "retry_in_callv3", - "server_listener", ], "cpp_end2end_test": [ "posix_ee_skip_grpc_init", @@ -204,9 +199,6 @@ EXPERIMENTS = { "free_large_allocator", "unconstrained_max_quota_buffer_size", ], - "xds_end2end_test": [ - "server_listener", - ], }, "on": { "cancel_ares_query_test": [ @@ -215,6 +207,7 @@ EXPERIMENTS = { "core_end2end_test": [ "event_engine_client", "event_engine_listener", + "server_listener", "work_serializer_dispatch", ], "cpp_end2end_test": [ @@ -238,6 +231,7 @@ EXPERIMENTS = { ], "xds_end2end_test": [ "pick_first_new", + "server_listener", "work_serializer_dispatch", ], }, diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index e9aec90448916..80c92fbf0714f 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -232,7 +232,7 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_work_serializer_dispatch, nullptr, 0, true, true}, {"server_listener", description_server_listener, additional_constraints_server_listener, - required_experiments_server_listener, 1, false, true}, + required_experiments_server_listener, 1, true, true}, }; } // namespace grpc_core @@ -448,7 +448,7 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_work_serializer_dispatch, nullptr, 0, true, true}, {"server_listener", description_server_listener, additional_constraints_server_listener, - required_experiments_server_listener, 1, false, true}, + required_experiments_server_listener, 1, true, true}, }; } // namespace grpc_core @@ -664,7 +664,7 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_work_serializer_dispatch, nullptr, 0, true, true}, {"server_listener", description_server_listener, additional_constraints_server_listener, - required_experiments_server_listener, 1, false, true}, + required_experiments_server_listener, 1, true, true}, }; } // namespace grpc_core diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index a661e04a3b250..128503f5edec0 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -96,7 +96,8 @@ inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH inline bool IsWorkSerializerDispatchEnabled() { return true; } -inline bool IsServerListenerEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_SERVER_LISTENER +inline bool IsServerListenerEnabled() { return true; } #elif defined(GPR_WINDOWS) #define GRPC_EXPERIMENT_IS_INCLUDED_BACKOFF_CAP_INITIAL_AT_MAX @@ -141,7 +142,8 @@ inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH inline bool IsWorkSerializerDispatchEnabled() { return true; } -inline bool IsServerListenerEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_SERVER_LISTENER +inline bool IsServerListenerEnabled() { return true; } #else #define GRPC_EXPERIMENT_IS_INCLUDED_BACKOFF_CAP_INITIAL_AT_MAX @@ -186,7 +188,8 @@ inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH inline bool IsWorkSerializerDispatchEnabled() { return true; } -inline bool IsServerListenerEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_SERVER_LISTENER +inline bool IsServerListenerEnabled() { return true; } #endif #else diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml index 480511bfee398..e6a3d969d7c98 100644 --- a/src/core/lib/experiments/rollouts.yaml +++ b/src/core/lib/experiments/rollouts.yaml @@ -111,7 +111,7 @@ - name: schedule_cancellation_over_write default: false - name: server_listener - default: false + default: true - name: server_privacy default: false - name: tcp_frame_size_tuning