commit 5b352f195cfe144d4e39363e2b54580b8ec6f041
author wub <wub@google.com> Tue May 07 11:45:26 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 07 21:02:26 2019 -0700
tree 58969a107b9d3f9b1eaf05062071c634854448df
parent a037b8b34eab00e5208e67685ff82c7cf5133c1c

gfe-relnote: (n/a) Remove unused QUIC connection option "BBQ4". Not protected.

Also changed kDerivedHighCWNDGain to 2.0f and fixed test 'DerivedCWNDGainStartup'.

PiperOrigin-RevId: 247060931
Change-Id: Ie1253736d8bc4dd81ba700ef0ee7826bba5eeb69

quic/core/congestion_control/bbr_sender.cc

diff --git a/quic/core/congestion_control/bbr_sender.cc b/quic/core/congestion_control/bbr_sender.cc
index 3ca2063..2c0ad34 100644
--- a/quic/core/congestion_control/bbr_sender.cc
+++ b/quic/core/congestion_control/bbr_sender.cc
@@ -30,7 +30,7 @@
 // The newly derived gain for STARTUP, equal to 4 * ln(2)
 const float kDerivedHighGain = 2.773f;
 // The newly derived CWND gain for STARTUP, 2.
-const float kDerivedHighCWNDGain = 2.773f;
+const float kDerivedHighCWNDGain = 2.0f;
 // The gain used in STARTUP after loss has been detected.
 // 1.5 is enough to allow for 25% exogenous loss and still observe a 25% growth
 // in measured bandwidth.
@@ -329,11 +329,6 @@
     QUIC_RELOADABLE_FLAG_COUNT_N(quic_bbr_slower_startup3, 3, 4);
     enable_ack_aggregation_during_startup_ = true;
   }
-  if (GetQuicReloadableFlag(quic_bbr_slower_startup3) &&
-      config.HasClientRequestedIndependentOption(kBBQ4, perspective)) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_bbr_slower_startup3, 4, 4);
-    set_drain_gain(kModerateProbeRttMultiplier);
-  }
   if (GetQuicReloadableFlag(quic_bbr_slower_startup4) &&
       config.HasClientRequestedIndependentOption(kBBQ5, perspective)) {
     QUIC_RELOADABLE_FLAG_COUNT(quic_bbr_slower_startup4);