From 297743e028c3d8ac0d568f08a9b3cd399f88d6e5 Mon Sep 17 00:00:00 2001 From: Yousuk Seung Date: Tue, 9 Jul 2024 13:34:15 -0700 Subject: [PATCH] [experiment] Disable work_serializer_dispatch (#37195) Causes crashes during shutdown. Closes #37195 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37195 from yousukseung:work-serializer-dispatch-disable 781bc59384bac5f04dde3e5ab8c54c6191cffd92 PiperOrigin-RevId: 650741850 --- bazel/experiments.bzl | 16 ++++++++++------ src/core/lib/experiments/experiments.cc | 2 +- src/core/lib/experiments/experiments.h | 3 +-- src/core/lib/experiments/rollouts.yaml | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index 09056684ac5..88bead1ccad 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -135,6 +135,10 @@ EXPERIMENTS = { "off": { "core_end2end_test": [ "event_engine_client", + "work_serializer_dispatch", + ], + "cpp_end2end_test": [ + "work_serializer_dispatch", ], "endpoint_test": [ "tcp_frame_size_tuning", @@ -150,10 +154,16 @@ EXPERIMENTS = { "tcp_frame_size_tuning", "tcp_rcv_lowat", ], + "lb_unit_test": [ + "work_serializer_dispatch", + ], "resource_quota_test": [ "free_large_allocator", "unconstrained_max_quota_buffer_size", ], + "xds_end2end_test": [ + "work_serializer_dispatch", + ], }, "on": { "cancel_ares_query_test": [ @@ -161,10 +171,6 @@ EXPERIMENTS = { ], "core_end2end_test": [ "event_engine_listener", - "work_serializer_dispatch", - ], - "cpp_end2end_test": [ - "work_serializer_dispatch", ], "cpp_lb_end2end_test": [ "pick_first_new", @@ -174,14 +180,12 @@ 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", ], }, }, diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index d076b175aa0..70326c37823 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -465,7 +465,7 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true, true}, {"work_serializer_dispatch", description_work_serializer_dispatch, - additional_constraints_work_serializer_dispatch, nullptr, 0, true, true}, + additional_constraints_work_serializer_dispatch, nullptr, 0, false, true}, }; } // namespace grpc_core diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index c5e62a41011..498557c5118 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -152,8 +152,7 @@ inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; } -#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH -inline bool IsWorkSerializerDispatchEnabled() { return true; } +inline bool IsWorkSerializerDispatchEnabled() { return false; } #endif #else diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml index df0c288affe..a8803b2331a 100644 --- a/src/core/lib/experiments/rollouts.yaml +++ b/src/core/lib/experiments/rollouts.yaml @@ -110,6 +110,6 @@ default: # TODO(ysseung): Not fully tested. ios: broken - posix: true + posix: false # TODO(ysseung): Test flakes not fully resolved. windows: broken