Remove the max_age_filter_float_to_top experiment since it has been rolled out for...

PiperOrigin-RevId: 839848318

diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
index 579a982860f49371d1f1f3efe134a401367e6a48..fcd7bf28a09422c6f33d34578cc4f7c9320da154 100644 (file)
--- a/bazel/experiments.bzl
+++ b/bazel/experiments.bzl
@@ -38,7 +38,6 @@ EXPERIMENT_ENABLES = {
     "graceful_external_connection_failure": "graceful_external_connection_failure",
     "keep_alive_ping_timer_batch": "keep_alive_ping_timer_batch",
     "local_connector_secure": "local_connector_secure",
-    "max_age_filter_float_to_top": "max_age_filter_float_to_top",
     "max_inflight_pings_strict_limit": "max_inflight_pings_strict_limit",
     "monitoring_experiment": "monitoring_experiment",
     "multiping": "multiping",

diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
index 6015ec036741dca8548e41f7a134cfb2f494d781..96b0de1139b64bf3ae8ffcd9308d6d66ad8beb5e 100644 (file)
--- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
+++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
@@ -307,7 +307,7 @@ void RegisterLegacyChannelIdleFilters(CoreConfiguration::Builder* builder) {
 
   builder->channel_init()
       ->RegisterV2Filter<LegacyMaxAgeFilter>(GRPC_SERVER_CHANNEL)
-      .FloatToTopIf(IsMaxAgeFilterFloatToTopEnabled())
+      .FloatToTop()
       .ExcludeFromMinimalStack()
       .If([](const ChannelArgs& channel_args) {
         return LegacyMaxAgeFilter::Config::FromChannelArgs(channel_args)

diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc
index 3b6eca83b786d1f5c846ffe9cb145bbe8b65cb8e..98df73f71376aee69f07e7fe2c1a16439d355396 100644 (file)
--- a/src/core/lib/experiments/experiments.cc
+++ b/src/core/lib/experiments/experiments.cc
@@ -104,9 +104,6 @@ const char* const description_local_connector_secure =
     "Local security connector uses TSI_SECURITY_NONE for LOCAL_TCP "
     "connections.";
 const char* const additional_constraints_local_connector_secure = "{}";
-const char* const description_max_age_filter_float_to_top =
-    "If set, the max age filter is placed at the top of the stack.";
-const char* const additional_constraints_max_age_filter_float_to_top = "{}";
 const char* const description_max_inflight_pings_strict_limit =
     "If set, the max inflight pings limit is strictly enforced.";
 const char* const additional_constraints_max_inflight_pings_strict_limit = "{}";
@@ -289,9 +286,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      true},
     {"local_connector_secure", description_local_connector_secure,
      additional_constraints_local_connector_secure, nullptr, 0, false, true},
-    {"max_age_filter_float_to_top", description_max_age_filter_float_to_top,
-     additional_constraints_max_age_filter_float_to_top, nullptr, 0, true,
-     true},
     {"max_inflight_pings_strict_limit",
      description_max_inflight_pings_strict_limit,
      additional_constraints_max_inflight_pings_strict_limit, nullptr, 0, true,
@@ -470,9 +464,6 @@ const char* const description_local_connector_secure =
     "Local security connector uses TSI_SECURITY_NONE for LOCAL_TCP "
     "connections.";
 const char* const additional_constraints_local_connector_secure = "{}";
-const char* const description_max_age_filter_float_to_top =
-    "If set, the max age filter is placed at the top of the stack.";
-const char* const additional_constraints_max_age_filter_float_to_top = "{}";
 const char* const description_max_inflight_pings_strict_limit =
     "If set, the max inflight pings limit is strictly enforced.";
 const char* const additional_constraints_max_inflight_pings_strict_limit = "{}";
@@ -655,9 +646,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      true},
     {"local_connector_secure", description_local_connector_secure,
      additional_constraints_local_connector_secure, nullptr, 0, false, true},
-    {"max_age_filter_float_to_top", description_max_age_filter_float_to_top,
-     additional_constraints_max_age_filter_float_to_top, nullptr, 0, true,
-     true},
     {"max_inflight_pings_strict_limit",
      description_max_inflight_pings_strict_limit,
      additional_constraints_max_inflight_pings_strict_limit, nullptr, 0, true,
@@ -836,9 +824,6 @@ const char* const description_local_connector_secure =
     "Local security connector uses TSI_SECURITY_NONE for LOCAL_TCP "
     "connections.";
 const char* const additional_constraints_local_connector_secure = "{}";
-const char* const description_max_age_filter_float_to_top =
-    "If set, the max age filter is placed at the top of the stack.";
-const char* const additional_constraints_max_age_filter_float_to_top = "{}";
 const char* const description_max_inflight_pings_strict_limit =
     "If set, the max inflight pings limit is strictly enforced.";
 const char* const additional_constraints_max_inflight_pings_strict_limit = "{}";
@@ -1021,9 +1006,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      true},
     {"local_connector_secure", description_local_connector_secure,
      additional_constraints_local_connector_secure, nullptr, 0, false, true},
-    {"max_age_filter_float_to_top", description_max_age_filter_float_to_top,
-     additional_constraints_max_age_filter_float_to_top, nullptr, 0, true,
-     true},
     {"max_inflight_pings_strict_limit",
      description_max_inflight_pings_strict_limit,
      additional_constraints_max_inflight_pings_strict_limit, nullptr, 0, true,

diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h
index 4c8ac863455e41222bed9080e8b6cecbcc64a9a2..2e7d2ff0e91e062d2c6c8f9207bec04f1871f51e 100644 (file)
--- a/src/core/lib/experiments/experiments.h
+++ b/src/core/lib/experiments/experiments.h
@@ -88,8 +88,6 @@ inline bool IsFuseFiltersEnabled() { return false; }
 inline bool IsGracefulExternalConnectionFailureEnabled() { return true; }
 inline bool IsKeepAlivePingTimerBatchEnabled() { return false; }
 inline bool IsLocalConnectorSecureEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_MAX_AGE_FILTER_FLOAT_TO_TOP
-inline bool IsMaxAgeFilterFloatToTopEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MAX_INFLIGHT_PINGS_STRICT_LIMIT
 inline bool IsMaxInflightPingsStrictLimitEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
@@ -153,8 +151,6 @@ inline bool IsFuseFiltersEnabled() { return false; }
 inline bool IsGracefulExternalConnectionFailureEnabled() { return true; }
 inline bool IsKeepAlivePingTimerBatchEnabled() { return false; }
 inline bool IsLocalConnectorSecureEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_MAX_AGE_FILTER_FLOAT_TO_TOP
-inline bool IsMaxAgeFilterFloatToTopEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MAX_INFLIGHT_PINGS_STRICT_LIMIT
 inline bool IsMaxInflightPingsStrictLimitEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
@@ -218,8 +214,6 @@ inline bool IsFuseFiltersEnabled() { return false; }
 inline bool IsGracefulExternalConnectionFailureEnabled() { return true; }
 inline bool IsKeepAlivePingTimerBatchEnabled() { return false; }
 inline bool IsLocalConnectorSecureEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_MAX_AGE_FILTER_FLOAT_TO_TOP
-inline bool IsMaxAgeFilterFloatToTopEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MAX_INFLIGHT_PINGS_STRICT_LIMIT
 inline bool IsMaxInflightPingsStrictLimitEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
@@ -275,7 +269,6 @@ enum ExperimentIds {
   kExperimentIdGracefulExternalConnectionFailure,
   kExperimentIdKeepAlivePingTimerBatch,
   kExperimentIdLocalConnectorSecure,
-  kExperimentIdMaxAgeFilterFloatToTop,
   kExperimentIdMaxInflightPingsStrictLimit,
   kExperimentIdMonitoringExperiment,
   kExperimentIdMultiping,
@@ -389,10 +382,6 @@ inline bool IsKeepAlivePingTimerBatchEnabled() {
 inline bool IsLocalConnectorSecureEnabled() {
   return IsExperimentEnabled<kExperimentIdLocalConnectorSecure>();
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_MAX_AGE_FILTER_FLOAT_TO_TOP
-inline bool IsMaxAgeFilterFloatToTopEnabled() {
-  return IsExperimentEnabled<kExperimentIdMaxAgeFilterFloatToTop>();
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_MAX_INFLIGHT_PINGS_STRICT_LIMIT
 inline bool IsMaxInflightPingsStrictLimitEnabled() {
   return IsExperimentEnabled<kExperimentIdMaxInflightPingsStrictLimit>();

diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml
index 8a106575eedc45408f676c49c99d8ca4422c6d2f..4159dfe32c14db1fe74ea7c6cf63c3c621b25191 100644 (file)
--- a/src/core/lib/experiments/experiments.yaml
+++ b/src/core/lib/experiments/experiments.yaml
@@ -178,11 +178,6 @@
   expiry: 2026/02/01
   owner: mattstev@google.com
   test_tags: ["core_end2end_test"]
-- name: max_age_filter_float_to_top
-  description: If set, the max age filter is placed at the top of the stack.
-  expiry: 2025/10/30
-  owner: vigneshbabu@google.com
-  test_tags: []
 - name: max_inflight_pings_strict_limit
   description: If set, the max inflight pings limit is strictly enforced.
   expiry: 2026/02/01

diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml
index e3b0e8f3eeff7d45936dd7318d0b1cf62debe1d6..4a2d986e1dc0ef660fa1f26f095af3f7aa522328 100644 (file)
--- a/src/core/lib/experiments/rollouts.yaml
+++ b/src/core/lib/experiments/rollouts.yaml
@@ -74,8 +74,6 @@
   default: false
 - name: local_connector_secure
   default: false
-- name: max_age_filter_float_to_top
-  default: true
 - name: max_inflight_pings_strict_limit
   default: true
 - name: monitoring_experiment