commit 80f9cc6565b65383fcfb531d09fe2b6994891797
author fayang <fayang@google.com> Wed Apr 22 08:08:20 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Apr 22 08:08:51 2020 -0700
tree 6ec10dcd568ab3460af8363c9dde62b03f0d7cc4
parent 6b40b1dae227a5115275f521e1447736cc640d2e

gfe-relnote: Deprecate gfe2_reloadable_flag_quic_send_ping_when_pto_skips_packet_number.

PiperOrigin-RevId: 307818289
Change-Id: Ib50add2a95c3e5cafb6b637b304dfe8980a50dc0

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 41e98cd..5ac44fc 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -2699,10 +2699,7 @@
     packet_creator_.SkipNPacketNumbers(
         num_packet_numbers_to_skip, sent_packet_manager_.GetLeastUnacked(),
         sent_packet_manager_.EstimateMaxPacketsInFlight(max_packet_length()));
-    if (GetQuicReloadableFlag(quic_send_ping_when_pto_skips_packet_number)) {
-      QUIC_RELOADABLE_FLAG_COUNT(quic_send_ping_when_pto_skips_packet_number);
-      previous_created_packet_number += num_packet_numbers_to_skip;
-    }
+    previous_created_packet_number += num_packet_numbers_to_skip;
     if (debug_visitor_ != nullptr) {
       debug_visitor_->OnNPacketNumbersSkipped(num_packet_numbers_to_skip);
     }

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index 2f161b5..0de52b4 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -10028,7 +10028,6 @@
   if (!connection_.version().SupportsAntiAmplificationLimit()) {
     return;
   }
-  SetQuicReloadableFlag(quic_send_ping_when_pto_skips_packet_number, true);
   EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
   EXPECT_FALSE(connection_.GetRetransmissionAlarm()->IsSet());
 
@@ -10504,25 +10503,14 @@
   EXPECT_EQ(MESSAGE_STATUS_SUCCESS, SendMessage("message"));
   EXPECT_TRUE(connection_.GetRetransmissionAlarm()->IsSet());
 
-  // Although there are bytes in flight, no packet gets sent on PTO firing.
-  if (GetQuicReloadableFlag(quic_send_ping_when_pto_skips_packet_number)) {
-    // PTO fires, verify a PING packet gets sent because there is no data to
-    // send.
-    EXPECT_CALL(*send_algorithm_,
-                OnPacketSent(_, _, QuicPacketNumber(3), _, _));
-    EXPECT_CALL(visitor_, SendPing()).WillOnce(Invoke([this]() {
-      SendPing();
-    }));
-  } else {
-    // No packet gets sent.
-    EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _)).Times(0);
-  }
+  // PTO fires, verify a PING packet gets sent because there is no data to
+  // send.
+  EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, QuicPacketNumber(3), _, _));
+  EXPECT_CALL(visitor_, SendPing()).WillOnce(Invoke([this]() { SendPing(); }));
   connection_.GetRetransmissionAlarm()->Fire();
-  if (GetQuicReloadableFlag(quic_send_ping_when_pto_skips_packet_number)) {
-    EXPECT_EQ(1u, connection_.GetStats().pto_count);
-    EXPECT_EQ(0u, connection_.GetStats().crypto_retransmit_count);
-    EXPECT_EQ(1u, writer_->ping_frames().size());
-  }
+  EXPECT_EQ(1u, connection_.GetStats().pto_count);
+  EXPECT_EQ(0u, connection_.GetStats().crypto_retransmit_count);
+  EXPECT_EQ(1u, writer_->ping_frames().size());
 }
 
 }  // namespace