From 3ca738907c9b8b1ff20951f9f9425e72f417722f Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 15 May 2024 20:11:53 -0700 Subject: [PATCH] [experiments] Remove pending_queue_cap experiment (#36632) Closes #36632 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36632 from ctiller:transport-refs-5 de23da2a541ba223ab4d3bf95df81f8e7eb4581e PiperOrigin-RevId: 634177606 --- bazel/experiments.bzl | 1 - src/core/lib/experiments/experiments.cc | 30 ----------------------- src/core/lib/experiments/experiments.h | 11 --------- src/core/lib/experiments/experiments.yaml | 11 --------- 4 files changed, 53 deletions(-) diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index 0bd711b6641..013e8ae208a 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -31,7 +31,6 @@ EXPERIMENT_ENABLES = { "monitoring_experiment": "monitoring_experiment", "multiping": "multiping", "peer_state_based_framing": "peer_state_based_framing", - "pending_queue_cap": "pending_queue_cap", "pick_first_new": "pick_first_new", "promise_based_client_call": "event_engine_client,event_engine_listener,promise_based_client_call", "chaotic_good": "chaotic_good,event_engine_client,event_engine_listener,promise_based_client_call", diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index 4bf01759fc2..a8996e8e124 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -70,14 +70,6 @@ const char* const description_peer_state_based_framing = "on the peer's memory pressure which is reflected in its max http2 frame " "size."; const char* const additional_constraints_peer_state_based_framing = "{}"; -const char* const description_pending_queue_cap = - "In the sync & async apis (but not the callback api), cap the number of " - "received but unrequested requests in the server for each call type. A " - "received message is one that was read from the wire on the server. A " - "requested message is one explicitly requested by the application using " - "grpc_server_request_call or grpc_server_request_registered_call (or their " - "wrappers in the C++ API)."; -const char* const additional_constraints_pending_queue_cap = "{}"; const char* const description_pick_first_new = "New pick_first impl with memory reduction."; const char* const additional_constraints_pick_first_new = "{}"; @@ -171,8 +163,6 @@ const ExperimentMetadata g_experiment_metadata[] = { nullptr, 0, false, true}, {"peer_state_based_framing", description_peer_state_based_framing, additional_constraints_peer_state_based_framing, nullptr, 0, false, true}, - {"pending_queue_cap", description_pending_queue_cap, - additional_constraints_pending_queue_cap, nullptr, 0, true, true}, {"pick_first_new", description_pick_first_new, additional_constraints_pick_first_new, nullptr, 0, true, true}, {"promise_based_client_call", description_promise_based_client_call, @@ -262,14 +252,6 @@ const char* const description_peer_state_based_framing = "on the peer's memory pressure which is reflected in its max http2 frame " "size."; const char* const additional_constraints_peer_state_based_framing = "{}"; -const char* const description_pending_queue_cap = - "In the sync & async apis (but not the callback api), cap the number of " - "received but unrequested requests in the server for each call type. A " - "received message is one that was read from the wire on the server. A " - "requested message is one explicitly requested by the application using " - "grpc_server_request_call or grpc_server_request_registered_call (or their " - "wrappers in the C++ API)."; -const char* const additional_constraints_pending_queue_cap = "{}"; const char* const description_pick_first_new = "New pick_first impl with memory reduction."; const char* const additional_constraints_pick_first_new = "{}"; @@ -363,8 +345,6 @@ const ExperimentMetadata g_experiment_metadata[] = { nullptr, 0, false, true}, {"peer_state_based_framing", description_peer_state_based_framing, additional_constraints_peer_state_based_framing, nullptr, 0, false, true}, - {"pending_queue_cap", description_pending_queue_cap, - additional_constraints_pending_queue_cap, nullptr, 0, true, true}, {"pick_first_new", description_pick_first_new, additional_constraints_pick_first_new, nullptr, 0, true, true}, {"promise_based_client_call", description_promise_based_client_call, @@ -454,14 +434,6 @@ const char* const description_peer_state_based_framing = "on the peer's memory pressure which is reflected in its max http2 frame " "size."; const char* const additional_constraints_peer_state_based_framing = "{}"; -const char* const description_pending_queue_cap = - "In the sync & async apis (but not the callback api), cap the number of " - "received but unrequested requests in the server for each call type. A " - "received message is one that was read from the wire on the server. A " - "requested message is one explicitly requested by the application using " - "grpc_server_request_call or grpc_server_request_registered_call (or their " - "wrappers in the C++ API)."; -const char* const additional_constraints_pending_queue_cap = "{}"; const char* const description_pick_first_new = "New pick_first impl with memory reduction."; const char* const additional_constraints_pick_first_new = "{}"; @@ -555,8 +527,6 @@ const ExperimentMetadata g_experiment_metadata[] = { nullptr, 0, false, true}, {"peer_state_based_framing", description_peer_state_based_framing, additional_constraints_peer_state_based_framing, nullptr, 0, false, true}, - {"pending_queue_cap", description_pending_queue_cap, - additional_constraints_pending_queue_cap, nullptr, 0, true, true}, {"pick_first_new", description_pick_first_new, additional_constraints_pick_first_new, nullptr, 0, true, true}, {"promise_based_client_call", description_promise_based_client_call, diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index 16220be2591..db7c9664bcd 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -74,8 +74,6 @@ inline bool IsKeepaliveServerFixEnabled() { return false; } inline bool IsMonitoringExperimentEnabled() { return true; } inline bool IsMultipingEnabled() { return false; } inline bool IsPeerStateBasedFramingEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP -inline bool IsPendingQueueCapEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW inline bool IsPickFirstNewEnabled() { return true; } inline bool IsPromiseBasedClientCallEnabled() { return false; } @@ -113,8 +111,6 @@ inline bool IsKeepaliveServerFixEnabled() { return false; } inline bool IsMonitoringExperimentEnabled() { return true; } inline bool IsMultipingEnabled() { return false; } inline bool IsPeerStateBasedFramingEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP -inline bool IsPendingQueueCapEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW inline bool IsPickFirstNewEnabled() { return true; } inline bool IsPromiseBasedClientCallEnabled() { return false; } @@ -152,8 +148,6 @@ inline bool IsKeepaliveServerFixEnabled() { return false; } inline bool IsMonitoringExperimentEnabled() { return true; } inline bool IsMultipingEnabled() { return false; } inline bool IsPeerStateBasedFramingEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP -inline bool IsPendingQueueCapEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW inline bool IsPickFirstNewEnabled() { return true; } inline bool IsPromiseBasedClientCallEnabled() { return false; } @@ -189,7 +183,6 @@ enum ExperimentIds { kExperimentIdMonitoringExperiment, kExperimentIdMultiping, kExperimentIdPeerStateBasedFraming, - kExperimentIdPendingQueueCap, kExperimentIdPickFirstNew, kExperimentIdPromiseBasedClientCall, kExperimentIdChaoticGood, @@ -261,10 +254,6 @@ inline bool IsMultipingEnabled() { inline bool IsPeerStateBasedFramingEnabled() { return IsExperimentEnabled(kExperimentIdPeerStateBasedFraming); } -#define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP -inline bool IsPendingQueueCapEnabled() { - return IsExperimentEnabled(kExperimentIdPendingQueueCap); -} #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW inline bool IsPickFirstNewEnabled() { return IsExperimentEnabled(kExperimentIdPickFirstNew); diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml index 0e00f5c4d68..4d1a27e4d3c 100644 --- a/src/core/lib/experiments/experiments.yaml +++ b/src/core/lib/experiments/experiments.yaml @@ -139,17 +139,6 @@ expiry: 2024/08/01 owner: vigneshbabu@google.com test_tags: ["flow_control_test"] -- name: pending_queue_cap - description: - In the sync & async apis (but not the callback api), cap the number of - received but unrequested requests in the server for each call type. - A received message is one that was read from the wire on the server. - A requested message is one explicitly requested by the application using - grpc_server_request_call or grpc_server_request_registered_call (or their - wrappers in the C++ API). - expiry: 2024/05/05 - owner: ctiller@google.com - test_tags: [] - name: pick_first_new description: New pick_first impl with memory reduction. expiry: 2024/07/30