Deprecate --gfe2_reloadable_flag_quic_bbr_start_new_aggregation_epoch_after_a_full_round PiperOrigin-RevId: 410075038
diff --git a/quic/core/congestion_control/bandwidth_sampler.cc b/quic/core/congestion_control/bandwidth_sampler.cc index 240e9dd..fd2cc8f 100644 --- a/quic/core/congestion_control/bandwidth_sampler.cc +++ b/quic/core/congestion_control/bandwidth_sampler.cc
@@ -64,8 +64,6 @@ last_sent_packet_number_before_epoch_.IsInitialized() && last_acked_packet_number.IsInitialized() && last_acked_packet_number > last_sent_packet_number_before_epoch_) { - QUIC_RELOADABLE_FLAG_COUNT( - quic_bbr_start_new_aggregation_epoch_after_a_full_round); QUIC_DVLOG(3) << "Force starting a new aggregation epoch. " "last_sent_packet_number_before_epoch_:" << last_sent_packet_number_before_epoch_
diff --git a/quic/core/congestion_control/bandwidth_sampler_test.cc b/quic/core/congestion_control/bandwidth_sampler_test.cc index 0e0dac4..7babb1f 100644 --- a/quic/core/congestion_control/bandwidth_sampler_test.cc +++ b/quic/core/congestion_control/bandwidth_sampler_test.cc
@@ -711,11 +711,7 @@ protected: MaxAckHeightTrackerTest() : tracker_(/*initial_filter_window=*/10) { tracker_.SetAckAggregationBandwidthThreshold(1.8); - - if (GetQuicReloadableFlag( - quic_bbr_start_new_aggregation_epoch_after_a_full_round)) { - tracker_.SetStartNewAggregationEpochAfterFullRound(true); - } + tracker_.SetStartNewAggregationEpochAfterFullRound(true); } // Run a full aggregation episode, which is one or more aggregated acks, @@ -886,12 +882,7 @@ last_sent_packet_number_, last_acked_packet_number_, now_, 100); - if (GetQuicReloadableFlag( - quic_bbr_start_new_aggregation_epoch_after_a_full_round)) { - EXPECT_EQ(2u, tracker_.num_ack_aggregation_epochs()); - } else { - EXPECT_EQ(1u, tracker_.num_ack_aggregation_epochs()); - } + EXPECT_EQ(2u, tracker_.num_ack_aggregation_epochs()); } } // namespace test
diff --git a/quic/core/congestion_control/bbr2_sender.cc b/quic/core/congestion_control/bbr2_sender.cc index c8acb9e..266c825 100644 --- a/quic/core/congestion_control/bbr2_sender.cc +++ b/quic/core/congestion_control/bbr2_sender.cc
@@ -195,9 +195,7 @@ params_.exit_startup_on_persistent_queue = true; } - if (GetQuicReloadableFlag( - quic_bbr_start_new_aggregation_epoch_after_a_full_round) && - ContainsQuicTag(connection_options, kBBRA)) { + if (ContainsQuicTag(connection_options, kBBRA)) { model_.SetStartNewAggregationEpochAfterFullRound(true); } if (GetQuicReloadableFlag(quic_bbr_use_send_rate_in_max_ack_height_tracker) &&
diff --git a/quic/core/congestion_control/bbr2_simulator_test.cc b/quic/core/congestion_control/bbr2_simulator_test.cc index 8ac2049..fbf1343 100644 --- a/quic/core/congestion_control/bbr2_simulator_test.cc +++ b/quic/core/congestion_control/bbr2_simulator_test.cc
@@ -1966,12 +1966,10 @@ kDefaultInitialCwndPackets, GetQuicFlag(FLAGS_quic_max_congestion_window), &random_, QuicConnectionPeer::GetStats(endpoint->connection()), nullptr); - if (GetQuicReloadableFlag( - quic_bbr_start_new_aggregation_epoch_after_a_full_round)) { - // TODO(ianswett): Add dedicated tests for this option until it becomes - // the default behavior. - SetConnectionOption(sender, kBBRA); - } + // TODO(ianswett): Add dedicated tests for this option until it becomes + // the default behavior. + SetConnectionOption(sender, kBBRA); + QuicConnectionPeer::SetSendAlgorithm(endpoint->connection(), sender); endpoint->RecordTrace(); return sender;
diff --git a/quic/core/congestion_control/bbr_sender.cc b/quic/core/congestion_control/bbr_sender.cc index ba7a357..59b089d 100644 --- a/quic/core/congestion_control/bbr_sender.cc +++ b/quic/core/congestion_control/bbr_sender.cc
@@ -278,9 +278,7 @@ if (ContainsQuicTag(connection_options, kBSAO)) { sampler_.EnableOverestimateAvoidance(); } - if (GetQuicReloadableFlag( - quic_bbr_start_new_aggregation_epoch_after_a_full_round) && - ContainsQuicTag(connection_options, kBBRA)) { + if (ContainsQuicTag(connection_options, kBBRA)) { sampler_.SetStartNewAggregationEpochAfterFullRound(true); } if (GetQuicReloadableFlag(quic_bbr_use_send_rate_in_max_ack_height_tracker) &&
diff --git a/quic/core/congestion_control/bbr_sender_test.cc b/quic/core/congestion_control/bbr_sender_test.cc index 754cf20..8973f94 100644 --- a/quic/core/congestion_control/bbr_sender_test.cc +++ b/quic/core/congestion_control/bbr_sender_test.cc
@@ -113,11 +113,7 @@ const int kTestMaxPacketSize = 1350; bbr_sender_.connection()->SetMaxPacketLength(kTestMaxPacketSize); sender_ = SetupBbrSender(&bbr_sender_); - if (GetQuicReloadableFlag( - quic_bbr_start_new_aggregation_epoch_after_a_full_round)) { - SetConnectionOption(kBBRA); - } - + SetConnectionOption(kBBRA); clock_ = simulator_.GetClock(); }
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h index 996fddf..3ff0043 100644 --- a/quic/core/quic_flags_list.h +++ b/quic/core/quic_flags_list.h
@@ -37,8 +37,6 @@ QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_can_send_ack_frequency, true) // If true, allow client to enable BBRv2 on server via connection option \'B2ON\'. QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_allow_client_enabled_bbr_v2, false) -// If true, always starts a new ack aggregation epoch if a full round has passed since the start of the current epoch. -QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr_start_new_aggregation_epoch_after_a_full_round, true) // If true, change QuicCryptoServerStream::FinishProcessingHandshakeMessageAfterProcessClientHello to noop if connection is disconnected. QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_crypto_noop_if_disconnected_after_process_chlo, true) // If true, clear undecryptable packets on handshake complete.