gfe-relnote: (n/a) Deprecate --gfe2_reloadable_flag_quic_bbr2_cut_inflight_hi_gradually.
PiperOrigin-RevId: 295151763
Change-Id: I0b10ddcceef886241cc1a7fe6db4f37f58ee0d86
diff --git a/quic/core/congestion_control/bbr2_probe_bw.cc b/quic/core/congestion_control/bbr2_probe_bw.cc
index e1cb58b..64240cf 100644
--- a/quic/core/congestion_control/bbr2_probe_bw.cc
+++ b/quic/core/congestion_control/bbr2_probe_bw.cc
@@ -172,20 +172,17 @@
if (!send_state.is_app_limited) {
QuicByteCount inflight_at_send = BytesInFlight(send_state);
- if (GetQuicReloadableFlag(quic_bbr2_cut_inflight_hi_gradually)) {
- QuicByteCount inflight_target =
- sender_->GetTargetBytesInflight() * (1.0 - Params().beta);
- if (inflight_at_send >= inflight_target) {
- // The new code does not change behavior.
- QUIC_CODE_COUNT(quic_bbr2_cut_inflight_hi_gradually_noop);
- } else {
- // The new code actually cuts inflight_hi slower than before.
- QUIC_CODE_COUNT(quic_bbr2_cut_inflight_hi_gradually_in_effect);
- }
- model_->set_inflight_hi(std::max(inflight_at_send, inflight_target));
+
+ QuicByteCount inflight_target =
+ sender_->GetTargetBytesInflight() * (1.0 - Params().beta);
+ if (inflight_at_send >= inflight_target) {
+ // The new code does not change behavior.
+ QUIC_CODE_COUNT(quic_bbr2_cut_inflight_hi_gradually_noop);
} else {
- model_->set_inflight_hi(inflight_at_send);
+ // The new code actually cuts inflight_hi slower than before.
+ QUIC_CODE_COUNT(quic_bbr2_cut_inflight_hi_gradually_in_effect);
}
+ model_->set_inflight_hi(std::max(inflight_at_send, inflight_target));
}
QUIC_DVLOG(3) << sender_ << " " << cycle_.phase
diff --git a/quic/core/congestion_control/bbr2_simulator_test.cc b/quic/core/congestion_control/bbr2_simulator_test.cc
index 6e6fa86..d109d54 100644
--- a/quic/core/congestion_control/bbr2_simulator_test.cc
+++ b/quic/core/congestion_control/bbr2_simulator_test.cc
@@ -784,12 +784,7 @@
{LostPacket(next_packet_number - 2, kDefaultMaxPacketSize)});
QuicByteCount inflight_hi = sender_->ExportDebugState().inflight_hi;
- if (GetQuicReloadableFlag(quic_bbr2_cut_inflight_hi_gradually)) {
- EXPECT_LT(2 * kDefaultMaxPacketSize, inflight_hi);
- } else {
- // Bytes inflight at send.
- EXPECT_EQ(2 * kDefaultMaxPacketSize, inflight_hi);
- }
+ EXPECT_LT(2 * kDefaultMaxPacketSize, inflight_hi);
}
// All Bbr2MultiSenderTests uses the following network topology:
