gfe-relnote: Deprecate gfe2_reloadable_flag_quic_simplify_stop_waiting.
PiperOrigin-RevId: 257008406
Change-Id: I8f7328c8b7c5249970a47f5004ad0610e4630931
diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index f86466e..ec3e9df 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -979,12 +979,8 @@
// If the incoming ack's packets set expresses received packets: peer is still
// acking packets which we never care about.
// Send an ack to raise the high water mark.
- bool send_stop_waiting = GetLeastUnacked() > start;
- if (GetQuicReloadableFlag(quic_simplify_stop_waiting) &&
- no_stop_waiting_frames_) {
- QUIC_RELOADABLE_FLAG_COUNT(quic_simplify_stop_waiting);
- send_stop_waiting = false;
- }
+ const bool send_stop_waiting =
+ no_stop_waiting_frames_ ? false : GetLeastUnacked() > start;
PostProcessAfterAckFrame(send_stop_waiting,
ack_result == PACKETS_NEWLY_ACKED);
processing_ack_frame_ = false;
diff --git a/quic/core/quic_connection.h b/quic/core/quic_connection.h
index a3d91ff..503581b 100644
--- a/quic/core/quic_connection.h
+++ b/quic/core/quic_connection.h
@@ -1241,7 +1241,6 @@
// Indicates how many consecutive times an ack has arrived which indicates
// the peer needs to stop waiting for some packets.
- // TODO(fayang): remove this when deprecating quic_simplify_stop_waiting.
int stop_waiting_count_;
// Indicates the retransmission alarm needs to be set.
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index 551e5be..0716425 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -2608,18 +2608,13 @@
connection_.SendStreamDataWithString(3, "foofoofoo", 9, NO_FIN);
// Ack bundled.
if (GetParam().no_stop_waiting) {
- if (GetQuicReloadableFlag(quic_simplify_stop_waiting)) {
- // Do not ACK acks.
- EXPECT_EQ(1u, writer_->frame_count());
- } else {
- EXPECT_EQ(2u, writer_->frame_count());
- }
+ // Do not ACK acks.
+ EXPECT_EQ(1u, writer_->frame_count());
} else {
EXPECT_EQ(3u, writer_->frame_count());
}
EXPECT_EQ(1u, writer_->stream_frames().size());
- if (GetParam().no_stop_waiting &&
- GetQuicReloadableFlag(quic_simplify_stop_waiting)) {
+ if (GetParam().no_stop_waiting) {
EXPECT_TRUE(writer_->ack_frames().empty());
} else {
EXPECT_FALSE(writer_->ack_frames().empty());
@@ -6504,19 +6499,13 @@
// Check that ack is bundled with outgoing data and the delayed ack
// alarm is reset.
if (GetParam().no_stop_waiting) {
- if (GetQuicReloadableFlag(quic_simplify_stop_waiting)) {
- // Do not ACK acks.
- EXPECT_EQ(1u, writer_->frame_count());
- } else {
- EXPECT_EQ(2u, writer_->frame_count());
- EXPECT_TRUE(writer_->stop_waiting_frames().empty());
- }
+ // Do not ACK acks.
+ EXPECT_EQ(1u, writer_->frame_count());
} else {
EXPECT_EQ(3u, writer_->frame_count());
EXPECT_FALSE(writer_->stop_waiting_frames().empty());
}
- if (GetParam().no_stop_waiting &&
- GetQuicReloadableFlag(quic_simplify_stop_waiting)) {
+ if (GetParam().no_stop_waiting) {
EXPECT_TRUE(writer_->ack_frames().empty());
} else {
EXPECT_FALSE(writer_->ack_frames().empty());
@@ -7956,12 +7945,8 @@
connection_.GetPingAlarm()->Fire();
size_t padding_frame_count = writer_->padding_frames().size();
if (GetParam().no_stop_waiting) {
- if (GetQuicReloadableFlag(quic_simplify_stop_waiting)) {
- // Do not ACK acks.
- EXPECT_EQ(padding_frame_count + 1u, writer_->frame_count());
- } else {
- EXPECT_EQ(padding_frame_count + 2u, writer_->frame_count());
- }
+ // Do not ACK acks.
+ EXPECT_EQ(padding_frame_count + 1u, writer_->frame_count());
} else {
EXPECT_EQ(padding_frame_count + 3u, writer_->frame_count());
}
diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc
index 686e983..d9e89ff 100644
--- a/quic/core/quic_versions.cc
+++ b/quic/core/quic_versions.cc
@@ -453,7 +453,6 @@
SetQuicFlag(FLAGS_quic_supports_tls_handshake, true);
SetQuicFlag(FLAGS_quic_headers_stream_id_in_v99, 60);
SetQuicReloadableFlag(quic_eliminate_static_stream_map_3, true);
- SetQuicReloadableFlag(quic_simplify_stop_waiting, true);
SetQuicRestartFlag(quic_do_not_override_connection_id, true);
SetQuicRestartFlag(quic_use_allocated_connection_ids, true);
}
