Deprecate gfe2_reloadable_flag_quic_stop_reading_when_level_triggered. gfe-relnote: n/a (Deprecate flag) PiperOrigin-RevId: 286892320 Change-Id: I6b9e896353a7c2ef46a747a6bab9d63d62f558c7
diff --git a/quic/core/quic_stream_sequencer.cc b/quic/core/quic_stream_sequencer.cc index a5f8599..845803d 100644 --- a/quic/core/quic_stream_sequencer.cc +++ b/quic/core/quic_stream_sequencer.cc
@@ -34,14 +34,8 @@ num_duplicate_frames_received_(0), ignore_read_data_(false), level_triggered_(false), - stop_reading_when_level_triggered_( - GetQuicReloadableFlag(quic_stop_reading_when_level_triggered)), close_connection_and_discard_data_on_wrong_offset_(GetQuicReloadableFlag( - quic_close_connection_and_discard_data_on_wrong_offset)) { - if (stop_reading_when_level_triggered_) { - QUIC_RELOADABLE_FLAG_COUNT(quic_stop_reading_when_level_triggered); - } -} + quic_close_connection_and_discard_data_on_wrong_offset)) {} QuicStreamSequencer::~QuicStreamSequencer() {} @@ -107,8 +101,7 @@ if (buffered_frames_.ReadableBytes() > previous_readable_bytes) { // Readable bytes has changed, let stream decide if to inform application // or not. - if (stop_reading_when_level_triggered_ && ignore_read_data_) { - QUIC_RELOADABLE_FLAG_COUNT(quic_stop_reading_when_level_triggered); + if (ignore_read_data_) { FlushBufferedFrames(); } else { stream_->OnDataAvailable();
diff --git a/quic/core/quic_stream_sequencer.h b/quic/core/quic_stream_sequencer.h index 878acb0..b8808a8 100644 --- a/quic/core/quic_stream_sequencer.h +++ b/quic/core/quic_stream_sequencer.h
@@ -207,11 +207,6 @@ // Otherwise, call OnDataAvailable() when number of readable bytes changes. bool level_triggered_; - // Latched value of quic_stop_reading_when_level_triggered flag. When true, - // the sequencer will discard incoming data (but not FIN bits) after - // StopReading is called, even in level_triggered_ mode. - const bool stop_reading_when_level_triggered_; - // Latched value of quic_close_connection_and_discard_data_on_wrong_offset. // When true, the sequencer will inform the stream to close connection when // wrong offset is received. And the stream frame's data will be discarded.
diff --git a/quic/core/quic_stream_sequencer_test.cc b/quic/core/quic_stream_sequencer_test.cc index 216a60e..b841327 100644 --- a/quic/core/quic_stream_sequencer_test.cc +++ b/quic/core/quic_stream_sequencer_test.cc
@@ -741,15 +741,10 @@ } TEST_F(QuicStreamSequencerTest, StopReadingWithLevelTriggered) { - if (GetQuicReloadableFlag(quic_stop_reading_when_level_triggered)) { - EXPECT_CALL(stream_, AddBytesConsumed(0)); - EXPECT_CALL(stream_, AddBytesConsumed(3)).Times(3); - EXPECT_CALL(stream_, OnDataAvailable()).Times(0); - EXPECT_CALL(stream_, OnFinRead()); - } else { - EXPECT_CALL(stream_, AddBytesConsumed(0)); - EXPECT_CALL(stream_, OnDataAvailable()).Times(3); - } + EXPECT_CALL(stream_, AddBytesConsumed(0)); + EXPECT_CALL(stream_, AddBytesConsumed(3)).Times(3); + EXPECT_CALL(stream_, OnDataAvailable()).Times(0); + EXPECT_CALL(stream_, OnFinRead()); sequencer_->set_level_triggered(true); sequencer_->StopReading();
diff --git a/quic/core/quic_stream_test.cc b/quic/core/quic_stream_test.cc index c53504a..ebb0f2c 100644 --- a/quic/core/quic_stream_test.cc +++ b/quic/core/quic_stream_test.cc
@@ -581,7 +581,6 @@ // Verify that after the consumer calls StopReading(), the stream still sends // flow control updates. TEST_P(QuicStreamTest, StopReadingSendsFlowControl) { - SetQuicReloadableFlag(quic_stop_reading_when_level_triggered, true); Initialize(); stream_->StopReading();
diff --git a/quic/quartc/quartc_factory.cc b/quic/quartc/quartc_factory.cc index 0b98a21..35a069a 100644 --- a/quic/quartc/quartc_factory.cc +++ b/quic/quartc/quartc_factory.cc
@@ -61,9 +61,6 @@ } void ConfigureGlobalQuicSettings() { - // Fixes behavior of StopReading() with level-triggered stream sequencers. - SetQuicReloadableFlag(quic_stop_reading_when_level_triggered, true); - // Ensure that we don't drop data because QUIC streams refuse to buffer it. // TODO(b/120099046): Replace this with correct handling of WriteMemSlices(). SetQuicFlag(FLAGS_quic_buffered_data_threshold, @@ -91,12 +88,6 @@ // settings doesn't seem preferable. ConfigureGlobalQuicSettings(); - // In exoblaze this may return false. DCHECK to avoid problems caused by - // incorrect flags configuration. - DCHECK(GetQuicReloadableFlag(quic_stop_reading_when_level_triggered)) - << "Your build does not support quic reloadable flags and shouldn't " - "place Quartc calls"; - QuicTagVector copt; copt.push_back(kNSTP);
diff --git a/quic/quartc/quartc_stream_test.cc b/quic/quartc/quartc_stream_test.cc index 0e972e5..3237b0b 100644 --- a/quic/quartc/quartc_stream_test.cc +++ b/quic/quartc/quartc_stream_test.cc
@@ -212,10 +212,7 @@ class QuartcStreamTest : public QuicTest, public QuicConnectionHelperInterface { public: - QuartcStreamTest() { - // Required to correctly handle StopReading(). - SetQuicReloadableFlag(quic_stop_reading_when_level_triggered, true); - } + QuartcStreamTest() {} ~QuartcStreamTest() override = default;