From 15a8aebc6d74fb2cf76fbeae9e6a7e153eb24bdd Mon Sep 17 00:00:00 2001 From: AJ Heller Date: Mon, 25 Sep 2023 11:00:34 -0700 Subject: [PATCH] [experiment] Remove work_stealing experiment configuration (#34468) Cleanup after https://github.com/grpc/grpc/pull/34315 --- bazel/experiments.bzl | 9 --------- src/core/lib/experiments/experiments.cc | 15 --------------- src/core/lib/experiments/experiments.h | 11 ----------- src/core/lib/experiments/experiments.yaml | 7 ------- src/core/lib/experiments/rollouts.yaml | 2 -- 5 files changed, 44 deletions(-) diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index ee6544cbfaf..f289e592ba0 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -59,9 +59,6 @@ EXPERIMENTS = { ], }, "on": { - "core_end2end_test": [ - "work_stealing", - ], "cpp_lb_end2end_test": [ "round_robin_delegate_to_pick_first", "wrr_delegate_to_pick_first", @@ -124,9 +121,6 @@ EXPERIMENTS = { ], }, "on": { - "core_end2end_test": [ - "work_stealing", - ], "cpp_lb_end2end_test": [ "round_robin_delegate_to_pick_first", "wrr_delegate_to_pick_first", @@ -199,9 +193,6 @@ EXPERIMENTS = { ], }, "on": { - "core_end2end_test": [ - "work_stealing", - ], "cpp_lb_end2end_test": [ "round_robin_delegate_to_pick_first", "wrr_delegate_to_pick_first", diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index a182b187604..5d515a463b0 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -73,9 +73,6 @@ const char* const additional_constraints_trace_record_callops = "{}"; const char* const description_event_engine_dns = "If set, use EventEngine DNSResolver for client channel resolution"; const char* const additional_constraints_event_engine_dns = "{}"; -const char* const description_work_stealing = - "If set, use a work stealing thread pool implementation in EventEngine"; -const char* const additional_constraints_work_stealing = "{}"; const char* const description_client_privacy = "If set, client privacy"; const char* const additional_constraints_client_privacy = "{}"; const char* const description_canary_client_privacy = @@ -157,8 +154,6 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_trace_record_callops, false, true}, {"event_engine_dns", description_event_engine_dns, additional_constraints_event_engine_dns, false, false}, - {"work_stealing", description_work_stealing, - additional_constraints_work_stealing, true, false}, {"client_privacy", description_client_privacy, additional_constraints_client_privacy, false, false}, {"canary_client_privacy", description_canary_client_privacy, @@ -243,9 +238,6 @@ const char* const additional_constraints_trace_record_callops = "{}"; const char* const description_event_engine_dns = "If set, use EventEngine DNSResolver for client channel resolution"; const char* const additional_constraints_event_engine_dns = "{}"; -const char* const description_work_stealing = - "If set, use a work stealing thread pool implementation in EventEngine"; -const char* const additional_constraints_work_stealing = "{}"; const char* const description_client_privacy = "If set, client privacy"; const char* const additional_constraints_client_privacy = "{}"; const char* const description_canary_client_privacy = @@ -327,8 +319,6 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_trace_record_callops, false, true}, {"event_engine_dns", description_event_engine_dns, additional_constraints_event_engine_dns, false, false}, - {"work_stealing", description_work_stealing, - additional_constraints_work_stealing, true, false}, {"client_privacy", description_client_privacy, additional_constraints_client_privacy, false, false}, {"canary_client_privacy", description_canary_client_privacy, @@ -413,9 +403,6 @@ const char* const additional_constraints_trace_record_callops = "{}"; const char* const description_event_engine_dns = "If set, use EventEngine DNSResolver for client channel resolution"; const char* const additional_constraints_event_engine_dns = "{}"; -const char* const description_work_stealing = - "If set, use a work stealing thread pool implementation in EventEngine"; -const char* const additional_constraints_work_stealing = "{}"; const char* const description_client_privacy = "If set, client privacy"; const char* const additional_constraints_client_privacy = "{}"; const char* const description_canary_client_privacy = @@ -497,8 +484,6 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_trace_record_callops, false, true}, {"event_engine_dns", description_event_engine_dns, additional_constraints_event_engine_dns, false, false}, - {"work_stealing", description_work_stealing, - additional_constraints_work_stealing, true, false}, {"client_privacy", description_client_privacy, additional_constraints_client_privacy, false, false}, {"canary_client_privacy", description_canary_client_privacy, diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index 308614b6aab..7f292e3ee5d 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -72,8 +72,6 @@ inline bool IsEventEngineListenerEnabled() { return false; } inline bool IsScheduleCancellationOverWriteEnabled() { return false; } inline bool IsTraceRecordCallopsEnabled() { return false; } inline bool IsEventEngineDnsEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_STEALING -inline bool IsWorkStealingEnabled() { return true; } inline bool IsClientPrivacyEnabled() { return false; } inline bool IsCanaryClientPrivacyEnabled() { return false; } inline bool IsServerPrivacyEnabled() { return false; } @@ -109,8 +107,6 @@ inline bool IsEventEngineListenerEnabled() { return false; } inline bool IsScheduleCancellationOverWriteEnabled() { return false; } inline bool IsTraceRecordCallopsEnabled() { return false; } inline bool IsEventEngineDnsEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_STEALING -inline bool IsWorkStealingEnabled() { return true; } inline bool IsClientPrivacyEnabled() { return false; } inline bool IsCanaryClientPrivacyEnabled() { return false; } inline bool IsServerPrivacyEnabled() { return false; } @@ -146,8 +142,6 @@ inline bool IsEventEngineListenerEnabled() { return false; } inline bool IsScheduleCancellationOverWriteEnabled() { return false; } inline bool IsTraceRecordCallopsEnabled() { return false; } inline bool IsEventEngineDnsEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_STEALING -inline bool IsWorkStealingEnabled() { return true; } inline bool IsClientPrivacyEnabled() { return false; } inline bool IsCanaryClientPrivacyEnabled() { return false; } inline bool IsServerPrivacyEnabled() { return false; } @@ -184,7 +178,6 @@ enum ExperimentIds { kExperimentIdScheduleCancellationOverWrite, kExperimentIdTraceRecordCallops, kExperimentIdEventEngineDns, - kExperimentIdWorkStealing, kExperimentIdClientPrivacy, kExperimentIdCanaryClientPrivacy, kExperimentIdServerPrivacy, @@ -255,10 +248,6 @@ inline bool IsTraceRecordCallopsEnabled() { inline bool IsEventEngineDnsEnabled() { return IsExperimentEnabled(kExperimentIdEventEngineDns); } -#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_STEALING -inline bool IsWorkStealingEnabled() { - return IsExperimentEnabled(kExperimentIdWorkStealing); -} #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_PRIVACY inline bool IsClientPrivacyEnabled() { return IsExperimentEnabled(kExperimentIdClientPrivacy); diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml index 274ea2a211b..89f41fc5ada 100644 --- a/src/core/lib/experiments/experiments.yaml +++ b/src/core/lib/experiments/experiments.yaml @@ -118,13 +118,6 @@ owner: yijiem@google.com test_tags: ["cancel_ares_query_test", "resolver_component_tests_runner_invoker"] allow_in_fuzzing_config: false -- name: work_stealing - description: - If set, use a work stealing thread pool implementation in EventEngine - expiry: 2023/11/01 - owner: hork@google.com - test_tags: ["core_end2end_test"] - allow_in_fuzzing_config: false - name: client_privacy description: If set, client privacy diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml index a458c71b459..d95b6346866 100644 --- a/src/core/lib/experiments/rollouts.yaml +++ b/src/core/lib/experiments/rollouts.yaml @@ -76,8 +76,6 @@ # TODO(yijiem): resolve when the WindowsEventEngine DNS Resolver is # implemented windows: broken -- name: work_stealing - default: true - name: work_serializer_dispatch default: false - name: client_privacy