From 1be5e4eff9875d3bf7d0a83d4a3b14a30f822aa7 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 8 Nov 2024 16:22:56 -0800 Subject: [PATCH] [work-serializer] Enable `work_serializer_dispatch` everywhere (#38054) Closes #38054 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/38054 from ctiller:burn-baby-burn 055de2f44411a20db328e1737a6c80c4b9ab0e7f PiperOrigin-RevId: 694680573 --- bazel/experiments.bzl | 14 ++++++++++++++ src/core/lib/experiments/experiments.cc | 4 ++-- src/core/lib/experiments/experiments.h | 6 ++++-- src/core/lib/experiments/rollouts.yaml | 7 +------ 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index 14c2f66a5df..6a3efa76833 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -84,6 +84,10 @@ EXPERIMENTS = { "core_end2end_test": [ "event_engine_client", "event_engine_listener", + "work_serializer_dispatch", + ], + "cpp_end2end_test": [ + "work_serializer_dispatch", ], "cpp_lb_end2end_test": [ "pick_first_new", @@ -96,12 +100,14 @@ EXPERIMENTS = { ], "lb_unit_test": [ "pick_first_new", + "work_serializer_dispatch", ], "resolver_component_tests_runner_invoker": [ "event_engine_dns", ], "xds_end2end_test": [ "pick_first_new", + "work_serializer_dispatch", ], }, }, @@ -129,14 +135,22 @@ EXPERIMENTS = { ], }, "on": { + "core_end2end_test": [ + "work_serializer_dispatch", + ], + "cpp_end2end_test": [ + "work_serializer_dispatch", + ], "cpp_lb_end2end_test": [ "pick_first_new", ], "lb_unit_test": [ "pick_first_new", + "work_serializer_dispatch", ], "xds_end2end_test": [ "pick_first_new", + "work_serializer_dispatch", ], }, }, diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index a6ac29e2fee..8d8ba347e5c 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -197,7 +197,7 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0, false, true}, {"work_serializer_dispatch", description_work_serializer_dispatch, - additional_constraints_work_serializer_dispatch, nullptr, 0, false, true}, + additional_constraints_work_serializer_dispatch, nullptr, 0, true, true}, }; } // namespace grpc_core @@ -378,7 +378,7 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0, false, true}, {"work_serializer_dispatch", description_work_serializer_dispatch, - additional_constraints_work_serializer_dispatch, nullptr, 0, false, true}, + additional_constraints_work_serializer_dispatch, nullptr, 0, true, true}, }; } // namespace grpc_core diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index 84089d39a8c..bf5b96bb229 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -90,7 +90,8 @@ inline bool IsTimeCachingInPartyEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } -inline bool IsWorkSerializerDispatchEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH +inline bool IsWorkSerializerDispatchEnabled() { return true; } #elif defined(GPR_WINDOWS) #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT @@ -129,7 +130,8 @@ inline bool IsTimeCachingInPartyEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } -inline bool IsWorkSerializerDispatchEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH +inline bool IsWorkSerializerDispatchEnabled() { return true; } #else #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml index e86499aa7a5..34b6226742b 100644 --- a/src/core/lib/experiments/rollouts.yaml +++ b/src/core/lib/experiments/rollouts.yaml @@ -113,9 +113,4 @@ - name: work_serializer_clears_time_cache default: true - name: work_serializer_dispatch - default: - # TODO(ysseung): Not fully tested. - ios: broken - posix: true - # TODO(ysseung): Test flakes not fully resolved. - windows: broken + default: true