Internal change PiperOrigin-RevId: 485958926
diff --git a/quiche/quic/core/congestion_control/bbr2_misc.h b/quiche/quic/core/congestion_control/bbr2_misc.h index 078c049..39d4747 100644 --- a/quiche/quic/core/congestion_control/bbr2_misc.h +++ b/quiche/quic/core/congestion_control/bbr2_misc.h
@@ -156,7 +156,7 @@ */ bool probe_up_includes_acks_after_cwnd_limited = false; bool probe_up_dont_exit_if_no_queue_ = false; - bool probe_up_ignore_inflight_hi = false; + bool probe_up_ignore_inflight_hi = true; /* * PROBE_RTT parameters.
diff --git a/quiche/quic/core/congestion_control/bbr2_sender.cc b/quiche/quic/core/congestion_control/bbr2_sender.cc index 880ea35..c3c5b90 100644 --- a/quiche/quic/core/congestion_control/bbr2_sender.cc +++ b/quiche/quic/core/congestion_control/bbr2_sender.cc
@@ -176,7 +176,7 @@ params_.probe_up_dont_exit_if_no_queue_ = true; } if (ContainsQuicTag(connection_options, kB203)) { - params_.probe_up_ignore_inflight_hi = true; + params_.probe_up_ignore_inflight_hi = false; } if (ContainsQuicTag(connection_options, kB204)) { model_.SetReduceExtraAckedOnBandwidthIncrease(true);
diff --git a/quiche/quic/core/congestion_control/bbr2_simulator_test.cc b/quiche/quic/core/congestion_control/bbr2_simulator_test.cc index f807f02..e9dc1e2 100644 --- a/quiche/quic/core/congestion_control/bbr2_simulator_test.cc +++ b/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
@@ -750,8 +750,9 @@ EXPECT_TRUE(simulator_result); } -// Test Bbr2's reaction to a 100x bandwidth increase during a transfer. -TEST_F(Bbr2DefaultTopologyTest, QUIC_SLOW_TEST(BandwidthIncrease)) { +// Test Bbr2's reaction to a 100x bandwidth increase during a transfer with B203 +TEST_F(Bbr2DefaultTopologyTest, QUIC_SLOW_TEST(BandwidthIncreaseB203)) { + SetConnectionOption(kB203); DefaultTopologyParams params; params.local_link.bandwidth = QuicBandwidth::FromKBitsPerSecond(15000); params.test_link.bandwidth = QuicBandwidth::FromKBitsPerSecond(100); @@ -921,9 +922,8 @@ sender_->ExportDebugState().bandwidth_hi, 0.92f); } -// Test Bbr2's reaction to a 100x bandwidth increase during a transfer with B203 -TEST_F(Bbr2DefaultTopologyTest, QUIC_SLOW_TEST(BandwidthIncreaseB203)) { - SetConnectionOption(kB203); +// Test Bbr2's reaction to a 100x bandwidth increase during a transfer. +TEST_F(Bbr2DefaultTopologyTest, QUIC_SLOW_TEST(BandwidthIncrease)) { DefaultTopologyParams params; params.local_link.bandwidth = QuicBandwidth::FromKBitsPerSecond(15000); params.test_link.bandwidth = QuicBandwidth::FromKBitsPerSecond(100); @@ -952,11 +952,9 @@ sender_->ExportDebugState().bandwidth_hi, 0.02f); } -// Test Bbr2's reaction to a 100x bandwidth increase during a transfer with B203 -// in the presence of ACK aggregation. -TEST_F(Bbr2DefaultTopologyTest, - QUIC_SLOW_TEST(BandwidthIncreaseB203Aggregation)) { - SetConnectionOption(kB203); +// Test Bbr2's reaction to a 100x bandwidth increase during a transfer in the +// presence of ACK aggregation. +TEST_F(Bbr2DefaultTopologyTest, QUIC_SLOW_TEST(BandwidthIncreaseAggregation)) { DefaultTopologyParams params; params.local_link.bandwidth = QuicBandwidth::FromKBitsPerSecond(15000); params.test_link.bandwidth = QuicBandwidth::FromKBitsPerSecond(100);