Deprecate --gfe2_reloadable_flag_quic_bbr_use_send_rate_in_max_ack_height_tracker.
PiperOrigin-RevId: 436553502
diff --git a/quic/core/congestion_control/bbr2_sender.cc b/quic/core/congestion_control/bbr2_sender.cc
index 266c825..240c333 100644
--- a/quic/core/congestion_control/bbr2_sender.cc
+++ b/quic/core/congestion_control/bbr2_sender.cc
@@ -198,10 +198,7 @@
if (ContainsQuicTag(connection_options, kBBRA)) {
model_.SetStartNewAggregationEpochAfterFullRound(true);
}
- if (GetQuicReloadableFlag(quic_bbr_use_send_rate_in_max_ack_height_tracker) &&
- ContainsQuicTag(connection_options, kBBRB)) {
- QUIC_RELOADABLE_FLAG_COUNT_N(
- quic_bbr_use_send_rate_in_max_ack_height_tracker, 2, 2);
+ if (ContainsQuicTag(connection_options, kBBRB)) {
model_.SetLimitMaxAckHeightTrackerBySendRate(true);
}
if (GetQuicReloadableFlag(
diff --git a/quic/core/congestion_control/bbr2_simulator_test.cc b/quic/core/congestion_control/bbr2_simulator_test.cc
index c634db5..95e6da8 100644
--- a/quic/core/congestion_control/bbr2_simulator_test.cc
+++ b/quic/core/congestion_control/bbr2_simulator_test.cc
@@ -566,7 +566,6 @@
}
TEST_F(Bbr2DefaultTopologyTest, SimpleTransferBBRB) {
- SetQuicReloadableFlag(quic_bbr_use_send_rate_in_max_ack_height_tracker, true);
SetConnectionOption(kBBRB);
DefaultTopologyParams params;
CreateNetwork(params);
diff --git a/quic/core/congestion_control/bbr_sender.cc b/quic/core/congestion_control/bbr_sender.cc
index 59b089d..db41058 100644
--- a/quic/core/congestion_control/bbr_sender.cc
+++ b/quic/core/congestion_control/bbr_sender.cc
@@ -281,10 +281,7 @@
if (ContainsQuicTag(connection_options, kBBRA)) {
sampler_.SetStartNewAggregationEpochAfterFullRound(true);
}
- if (GetQuicReloadableFlag(quic_bbr_use_send_rate_in_max_ack_height_tracker) &&
- ContainsQuicTag(connection_options, kBBRB)) {
- QUIC_RELOADABLE_FLAG_COUNT_N(
- quic_bbr_use_send_rate_in_max_ack_height_tracker, 1, 2);
+ if (ContainsQuicTag(connection_options, kBBRB)) {
sampler_.SetLimitMaxAckHeightTrackerBySendRate(true);
}
}
diff --git a/quic/core/congestion_control/bbr_sender_test.cc b/quic/core/congestion_control/bbr_sender_test.cc
index caba9b1..98a95ec 100644
--- a/quic/core/congestion_control/bbr_sender_test.cc
+++ b/quic/core/congestion_control/bbr_sender_test.cc
@@ -325,7 +325,6 @@
}
TEST_F(BbrSenderTest, SimpleTransferBBRB) {
- SetQuicReloadableFlag(quic_bbr_use_send_rate_in_max_ack_height_tracker, true);
SetConnectionOption(kBBRB);
CreateDefaultSetup();
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index bd3b8f3..ee642d9 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -91,8 +91,6 @@
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_donot_reset_ideal_next_packet_send_time, false)
// If true, use BBRv2 as the default congestion controller. Takes precedence over --quic_default_to_bbr.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_default_to_bbr_v2, false)
-// If true, use max(max_bw, send_rate) as the estimated bandwidth in QUIC\'s MaxAckHeightTracker.
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr_use_send_rate_in_max_ack_height_tracker, true)
// If true, use new connection ID in connection migration.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_connection_migration_use_new_cid_v2, true)
// If true, uses conservative cwnd gain and pacing gain when cwnd gets bootstrapped.
