Deprecate gfe2_reloadable_flag_quic_preempt_stream_data_with_handshake_packet.
PiperOrigin-RevId: 374222369
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index b54b03f..8efba88 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -2506,17 +2506,8 @@
// Large response (100KB) for 0-RTT request.
std::string large_body(102400, 'a');
AddToCache("/large_response", 200, large_body);
- if (GetQuicReloadableFlag(quic_preempt_stream_data_with_handshake_packet)) {
- SendSynchronousRequestAndCheckResponse(client_.get(), "/large_response",
- large_body);
- } else {
- // Server consistently gets constrained by amplification factor, hence PTO
- // never gets armed. The CHLO retransmission would trigger the
- // retransmission of SHLO, however, the ENCRYPTION_HANDSHAKE packet NEVER
- // gets retransmitted since half RTT data consumes the remaining space in
- // the coalescer.
- EXPECT_EQ("", client_->SendSynchronousRequest("/large_response"));
- }
+ SendSynchronousRequestAndCheckResponse(client_.get(), "/large_response",
+ large_body);
}
TEST_P(EndToEndTest, MaxStreamsUberTest) {
diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 027f587..8ac5c0c 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -2567,11 +2567,8 @@
QuicUtils::IsCryptoStreamId(transport_version(), id)) {
MaybeActivateLegacyVersionEncapsulation();
}
- if (GetQuicReloadableFlag(quic_preempt_stream_data_with_handshake_packet) &&
- perspective_ == Perspective::IS_SERVER &&
+ if (perspective_ == Perspective::IS_SERVER &&
version().CanSendCoalescedPackets() && !IsHandshakeConfirmed()) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_preempt_stream_data_with_handshake_packet,
- 1, 2);
if (GetQuicReloadableFlag(quic_donot_pto_half_rtt_data)) {
QUIC_RELOADABLE_FLAG_COUNT(quic_donot_pto_half_rtt_data);
if (in_on_retransmission_time_out_ &&
@@ -2587,8 +2584,6 @@
// Handshake is not confirmed yet, if there is only an initial packet in
// the coalescer, try to bundle an ENCRYPTION_HANDSHAKE packet before
// sending stream data.
- QUIC_RELOADABLE_FLAG_COUNT_N(
- quic_preempt_stream_data_with_handshake_packet, 2, 2);
sent_packet_manager_.RetransmitDataOfSpaceIfAny(HANDSHAKE_DATA);
}
}
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index bf61b34..9ef1148 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -14980,8 +14980,7 @@
ASSERT_TRUE(connection_.GetRetransmissionAlarm()->IsSet());
connection_.GetRetransmissionAlarm()->Fire();
- if (GetQuicReloadableFlag(quic_preempt_stream_data_with_handshake_packet) &&
- GetQuicReloadableFlag(quic_donot_pto_half_rtt_data)) {
+ if (GetQuicReloadableFlag(quic_donot_pto_half_rtt_data)) {
// Verify INITIAL and HANDSHAKE get retransmitted.
EXPECT_EQ(0x02020202u, writer_->final_bytes_of_last_packet());
} else {
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index 899c868..2caa91a 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -91,8 +91,6 @@
QUIC_FLAG(FLAGS_quic_restart_flag_quic_dispatcher_support_multiple_cid_per_connection_v2, true)
// If true, require handshake confirmation for QUIC connections, functionally disabling 0-rtt handshakes.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_require_handshake_confirmation, false)
-// If true, retransmit ENCRYPTION_HANDSHAKE data before any stream data before handshake confirmed.
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_preempt_stream_data_with_handshake_packet, true)
// If true, send PATH_RESPONSE upon receiving PATH_CHALLENGE regardless of perspective. --gfe2_reloadable_flag_quic_start_peer_migration_earlier has to be true before turn on this flag.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_send_path_response2, true)
// If true, set burst token to 2 in cwnd bootstrapping experiment.
