Deprecate --gfe2_reloadable_flag_quic_bbr2_reset_max_bytes_delivered.
PiperOrigin-RevId: 361688357
Change-Id: Ib14f23855218384579f479c398960383983f5e19
diff --git a/quic/core/congestion_control/bbr2_misc.cc b/quic/core/congestion_control/bbr2_misc.cc
index d7e386e..026b33a 100644
--- a/quic/core/congestion_control/bbr2_misc.cc
+++ b/quic/core/congestion_control/bbr2_misc.cc
@@ -273,13 +273,7 @@
QuicPacketNumber least_unacked_packet,
const Bbr2CongestionEvent& congestion_event) {
if (congestion_event.end_of_round_trip) {
- if (!reset_max_bytes_delivered_) {
- bytes_lost_in_round_ = 0;
- loss_events_in_round_ = 0;
- } else {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_bbr2_reset_max_bytes_delivered, 1, 2);
- OnNewRound();
- }
+ OnNewRound();
}
bandwidth_sampler_.RemoveObsoletePackets(least_unacked_packet);
@@ -354,19 +348,11 @@
}
void Bbr2NetworkModel::RestartRoundEarly() {
- if (!reset_max_bytes_delivered_) {
- bytes_lost_in_round_ = 0;
- loss_events_in_round_ = 0;
- max_bytes_delivered_in_round_ = 0;
- } else {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_bbr2_reset_max_bytes_delivered, 2, 2);
- OnNewRound();
- }
+ OnNewRound();
round_trip_counter_.RestartRound();
}
void Bbr2NetworkModel::OnNewRound() {
- QUICHE_DCHECK(reset_max_bytes_delivered_);
bytes_lost_in_round_ = 0;
loss_events_in_round_ = 0;
max_bytes_delivered_in_round_ = 0;
diff --git a/quic/core/congestion_control/bbr2_misc.h b/quic/core/congestion_control/bbr2_misc.h
index 8b53c1b..4d1cc20 100644
--- a/quic/core/congestion_control/bbr2_misc.h
+++ b/quic/core/congestion_control/bbr2_misc.h
@@ -552,8 +552,6 @@
bool full_bandwidth_reached_ = false;
QuicBandwidth full_bandwidth_baseline_ = QuicBandwidth::Zero();
QuicRoundTripCount rounds_without_bandwidth_growth_ = 0;
- const bool reset_max_bytes_delivered_ =
- GetQuicReloadableFlag(quic_bbr2_reset_max_bytes_delivered);
};
enum class Bbr2Mode : uint8_t {
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index 3627a99..dc02c1c 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -13,7 +13,6 @@
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_avoid_too_low_probe_bw_cwnd, false)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_bw_startup, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_fewer_startup_round_trips, true)
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_reset_max_bytes_delivered, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_can_send_ack_frequency, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_close_connection_on_0rtt_packet_number_higher_than_1rtt, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_close_connection_with_too_many_outstanding_packets, true)
