In bbr2sender::adjustnetworkparameters, 1) do not inject a bandwidth sample to max bandwidth filter, and 2) update pacing rate after cwnd is updated. protected by --gfe2_reloadable_flag_quic_bbr2_improve_adjust_network_parameters.
PiperOrigin-RevId: 321198508
Change-Id: I4366a2b159c48302eaf935784dfb7d093d322257
diff --git a/quic/core/congestion_control/bbr2_sender.cc b/quic/core/congestion_control/bbr2_sender.cc
index d1b3159..3f80f42 100644
--- a/quic/core/congestion_control/bbr2_sender.cc
+++ b/quic/core/congestion_control/bbr2_sender.cc
@@ -167,14 +167,28 @@
if (mode_ == Bbr2Mode::STARTUP) {
const QuicByteCount prior_cwnd = cwnd_;
- // Normally UpdateCongestionWindow updates |cwnd_| towards the target by a
- // small step per congestion event, by changing |cwnd_| to the bdp at here
- // we are reducing the number of updates needed to arrive at the target.
- cwnd_ = model_.BDP(model_.BandwidthEstimate());
- UpdateCongestionWindow(0);
+ if (model_.improve_adjust_network_parameters()) {
+ QUIC_RELOADABLE_FLAG_COUNT(quic_bbr2_improve_adjust_network_parameters);
+ QuicBandwidth effective_bandwidth =
+ std::max(params.bandwidth, model_.BandwidthEstimate());
+ cwnd_ = cwnd_limits().ApplyLimits(model_.BDP(effective_bandwidth));
+ } else {
+ // Normally UpdateCongestionWindow updates |cwnd_| towards the target by a
+ // small step per congestion event, by changing |cwnd_| to the bdp at here
+ // we are reducing the number of updates needed to arrive at the target.
+ cwnd_ = model_.BDP(model_.BandwidthEstimate());
+ UpdateCongestionWindow(0);
+ }
+
if (!params.allow_cwnd_to_decrease) {
cwnd_ = std::max(cwnd_, prior_cwnd);
}
+
+ if (model_.improve_adjust_network_parameters()) {
+ pacing_rate_ = std::max(
+ pacing_rate_,
+ QuicBandwidth::FromBytesAndTimeDelta(cwnd_, model_.MinRtt()));
+ }
}
}
