Deprecate --gfe2_reloadable_flag_quic_bbr2_add_bytes_acked_after_inflight_hi_limited.
PiperOrigin-RevId: 457562236
diff --git a/quiche/quic/core/congestion_control/bbr2_probe_bw.cc b/quiche/quic/core/congestion_control/bbr2_probe_bw.cc
index 48d98de..a06b7d1 100644
--- a/quiche/quic/core/congestion_control/bbr2_probe_bw.cc
+++ b/quiche/quic/core/congestion_control/bbr2_probe_bw.cc
@@ -365,8 +365,6 @@
return;
}
} else if (Params().probe_up_includes_acks_after_cwnd_limited) {
- QUIC_RELOADABLE_FLAG_COUNT(
- quic_bbr2_add_bytes_acked_after_inflight_hi_limited);
// Don't continue adding bytes to probe_up_acked if the sender was not
// app-limited after being inflight_hi limited at least once.
if (!cycle_.probe_up_app_limited_since_inflight_hi_limited_ ||
diff --git a/quiche/quic/core/congestion_control/bbr2_sender.cc b/quiche/quic/core/congestion_control/bbr2_sender.cc
index 6178907..bbfdcbb 100644
--- a/quiche/quic/core/congestion_control/bbr2_sender.cc
+++ b/quiche/quic/core/congestion_control/bbr2_sender.cc
@@ -198,9 +198,7 @@
if (ContainsQuicTag(connection_options, kBBRB)) {
model_.SetLimitMaxAckHeightTrackerBySendRate(true);
}
- if (GetQuicReloadableFlag(
- quic_bbr2_add_bytes_acked_after_inflight_hi_limited) &&
- ContainsQuicTag(connection_options, kBBQ0)) {
+ if (ContainsQuicTag(connection_options, kBBQ0)) {
params_.probe_up_includes_acks_after_cwnd_limited = true;
}
diff --git a/quiche/quic/core/congestion_control/bbr2_simulator_test.cc b/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
index fdf036b..343dff9 100644
--- a/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
+++ b/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
@@ -776,8 +776,6 @@
// Test Bbr2's reaction to a 100x bandwidth increase during a transfer with BBQ0
TEST_F(Bbr2DefaultTopologyTest, QUIC_SLOW_TEST(BandwidthIncreaseBBQ0)) {
- SetQuicReloadableFlag(quic_bbr2_add_bytes_acked_after_inflight_hi_limited,
- true);
SetConnectionOption(kBBQ0);
DefaultTopologyParams params;
params.local_link.bandwidth = QuicBandwidth::FromKBitsPerSecond(15000);
@@ -811,8 +809,6 @@
// in the presence of ACK aggregation.
TEST_F(Bbr2DefaultTopologyTest,
QUIC_SLOW_TEST(BandwidthIncreaseBBQ0Aggregation)) {
- SetQuicReloadableFlag(quic_bbr2_add_bytes_acked_after_inflight_hi_limited,
- true);
SetConnectionOption(kBBQ0);
DefaultTopologyParams params;
params.local_link.bandwidth = QuicBandwidth::FromKBitsPerSecond(15000);
diff --git a/quiche/quic/core/quic_flags_list.h b/quiche/quic/core/quic_flags_list.h
index c45c53c..82d2e6e 100644
--- a/quiche/quic/core/quic_flags_list.h
+++ b/quiche/quic/core/quic_flags_list.h
@@ -113,8 +113,6 @@
QUIC_FLAG(quic_reloadable_flag_quic_bbr2_startup_extra_acked, true)
// When true, the B207 connection option causes BBR2 to exit STARTUP if a persistent queue of 2*BDP has existed for the entire round.
QUIC_FLAG(quic_reloadable_flag_quic_bbr2_exit_startup_on_persistent_queue2, true)
-// When true, the BBQ0 connection option causes QUIC BBR2 to add bytes_acked to probe_up_acked if the connection hasn\'t been app-limited since inflight_hi was utilized.
-QUIC_FLAG(quic_reloadable_flag_quic_bbr2_add_bytes_acked_after_inflight_hi_limited, true)
// When true, the BBR4 copt sets the extra_acked window to 20 RTTs and BBR5 sets it to 40 RTTs.
QUIC_FLAG(quic_reloadable_flag_quic_bbr2_extra_acked_window, true)
