Deprecate --gfe2_reloadable_flag_quic_flush_pending_frames_and_padding_bytes_on_migration
PiperOrigin-RevId: 551311997
diff --git a/quiche/quic/core/quic_connection.cc b/quiche/quic/core/quic_connection.cc
index cbc4f33..cfd5efb 100644
--- a/quiche/quic/core/quic_connection.cc
+++ b/quiche/quic/core/quic_connection.cc
@@ -5154,25 +5154,13 @@
<< "EffectivePeerMigration started without address change.";
return;
}
- if (GetQuicReloadableFlag(
- quic_flush_pending_frames_and_padding_bytes_on_migration)) {
- QUIC_RELOADABLE_FLAG_COUNT(
- quic_flush_pending_frames_and_padding_bytes_on_migration);
- // There could be pending NEW_TOKEN_FRAME triggered by non-probing
- // PATH_RESPONSE_FRAME in the same packet or pending padding bytes in the
- // packet creator.
- packet_creator_.FlushCurrentPacket();
- packet_creator_.SendRemainingPendingPadding();
- if (!connected_) {
- return;
- }
- } else {
- if (packet_creator_.HasPendingFrames()) {
- packet_creator_.FlushCurrentPacket();
- if (!connected_) {
- return;
- }
- }
+ // There could be pending NEW_TOKEN_FRAME triggered by non-probing
+ // PATH_RESPONSE_FRAME in the same packet or pending padding bytes in the
+ // packet creator.
+ packet_creator_.FlushCurrentPacket();
+ packet_creator_.SendRemainingPendingPadding();
+ if (!connected_) {
+ return;
}
// Action items:
diff --git a/quiche/quic/core/quic_connection_test.cc b/quiche/quic/core/quic_connection_test.cc
index d91c041..9fd7756 100644
--- a/quiche/quic/core/quic_connection_test.cc
+++ b/quiche/quic/core/quic_connection_test.cc
@@ -2173,20 +2173,12 @@
EXPECT_CALL(visitor_, OnConnectionMigration(PORT_CHANGE)).Times(1);
ProcessFramesPacketWithAddresses({QuicFrame(&ack_frame)}, kSelfAddress,
kPeerAddress3, ENCRYPTION_FORWARD_SECURE);
- if (GetQuicReloadableFlag(
- quic_flush_pending_frames_and_padding_bytes_on_migration)) {
- // Any pending frames/padding should be flushed before default_path_ is
- // temporarily reset.
- ASSERT_EQ(connection_.self_address_on_default_path_while_sending_packet()
- .host()
- .address_family(),
- IpAddressFamily::IP_V6);
- } else {
- ASSERT_EQ(connection_.self_address_on_default_path_while_sending_packet()
- .host()
- .address_family(),
- IpAddressFamily::IP_UNSPEC);
- }
+ // Any pending frames/padding should be flushed before default_path_ is
+ // temporarily reset.
+ ASSERT_EQ(connection_.self_address_on_default_path_while_sending_packet()
+ .host()
+ .address_family(),
+ IpAddressFamily::IP_V6);
}
// Regression test for b/196208556.
@@ -4690,7 +4682,7 @@
ProcessAckPacket(&frame);
SendStreamDataToPeer(1, "bar", 3, NO_FIN, nullptr); // Packet 4
- SendAckPacketToPeer(); // Packet 5
+ SendAckPacketToPeer(); // Packet 5
// Send two data packets at the end, and ensure if the last one is acked,
// the least unacked is raised above the ack packets.
diff --git a/quiche/quic/core/quic_flags_list.h b/quiche/quic/core/quic_flags_list.h
index e62564d..9cdfe3d 100644
--- a/quiche/quic/core/quic_flags_list.h
+++ b/quiche/quic/core/quic_flags_list.h
@@ -63,8 +63,6 @@
QUIC_FLAG(quic_reloadable_flag_quic_do_not_write_when_no_client_cid_available, true)
// If true, enable server retransmittable on wire PING.
QUIC_FLAG(quic_reloadable_flag_quic_enable_server_on_wire_ping, true)
-// If true, flush pending frames as well as pending padding bytes on connection migration.
-QUIC_FLAG(quic_reloadable_flag_quic_flush_pending_frames_and_padding_bytes_on_migration, true)
// If true, include stream information in idle timeout connection close detail.
QUIC_FLAG(quic_reloadable_flag_quic_add_stream_info_to_idle_close_detail, true)
// If true, reject or send error response code upon receiving invalid request or response headers.
