commit 03637f56a2c66f3a665e4e714520662ac2a998bf
author wub <wub@google.com> Thu May 30 10:52:20 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri May 31 15:30:42 2019 -0700
tree 4f4c1ee3e747da047fbc33fd4d75128879b5ac40
parent d4291e4cc284022b8e8e1cb1e8ba5445da4744fb

gfe-relnote: (n/a) Deprecate --gfe2_reloadable_flag_quic_always_get_bw_sample_when_acked.

PiperOrigin-RevId: 250718928
Change-Id: I77aef64913cb789cbdf165551ba2818c8efb6adf

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 5844987..3c975df 100644
--- a/quic/core/congestion_control/bbr_sender.cc
+++ b/quic/core/congestion_control/bbr_sender.cc
@@ -137,9 +137,7 @@
       probe_rtt_skipped_if_similar_rtt_(false),
       probe_rtt_disabled_if_app_limited_(false),
       app_limited_since_last_probe_rtt_(false),
-      min_rtt_since_last_probe_rtt_(QuicTime::Delta::Infinite()),
-      always_get_bw_sample_when_acked_(
-          GetQuicReloadableFlag(quic_always_get_bw_sample_when_acked)) {
+      min_rtt_since_last_probe_rtt_(QuicTime::Delta::Infinite()) {
   if (stats_) {
     stats_->slowstart_count = 0;
     stats_->slowstart_start_time = QuicTime::Zero();
@@ -526,14 +524,9 @@
     const AckedPacketVector& acked_packets) {
   QuicTime::Delta sample_min_rtt = QuicTime::Delta::Infinite();
   for (const auto& packet : acked_packets) {
-    if (!always_get_bw_sample_when_acked_ && packet.bytes_acked == 0) {
-      // Skip acked packets with 0 in flight bytes when updating bandwidth.
-      continue;
-    }
     BandwidthSample bandwidth_sample =
         sampler_.OnPacketAcknowledged(now, packet.packet_number);
-    if (always_get_bw_sample_when_acked_ &&
-        !bandwidth_sample.state_at_send.is_valid) {
+    if (!bandwidth_sample.state_at_send.is_valid) {
       // From the sampler's perspective, the packet has never been sent, or the
       // packet has been acked or marked as lost previously.
       continue;