deprecate gfe2_reloadable_flag_quic_do_not_use_stream_map.
PiperOrigin-RevId: 331033161
Change-Id: Iddd80e19237cccd3e4af09ac1617c4312de21851
diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index f0b9d92..56a7c64 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -101,10 +101,8 @@
enable_round_robin_scheduling_(false),
was_zero_rtt_rejected_(false),
liveness_testing_in_progress_(false),
- do_not_use_stream_map_(GetQuicReloadableFlag(quic_do_not_use_stream_map)),
remove_zombie_streams_(
- GetQuicReloadableFlag(quic_remove_zombie_streams) &&
- do_not_use_stream_map_) {
+ GetQuicReloadableFlag(quic_remove_zombie_streams)) {
closed_streams_clean_up_alarm_ =
QuicWrapUnique<QuicAlarm>(connection_->alarm_factory()->CreateAlarm(
new ClosedStreamsCleanUpDelegate(this)));
@@ -386,42 +384,22 @@
GetMutableCryptoStream()->OnConnectionClosed(frame.quic_error_code, source);
- if (!do_not_use_stream_map_) {
- // Copy all non static streams in a new map for the ease of deleting.
- std::vector<QuicStream*> non_static_streams;
- for (const auto& it : stream_map_) {
- if (!it.second->is_static()) {
- non_static_streams.push_back(it.second.get());
- }
- }
-
- for (QuicStream* stream : non_static_streams) {
- QuicStreamId id = stream->id();
- stream->OnConnectionClosed(frame.quic_error_code, source);
- if (stream_map_.find(id) != stream_map_.end()) {
+ PerformActionOnActiveStreams([this, frame, source](QuicStream* stream) {
+ QuicStreamId id = stream->id();
+ stream->OnConnectionClosed(frame.quic_error_code, source);
+ auto it = stream_map_.find(id);
+ if (it != stream_map_.end()) {
+ if (!remove_zombie_streams_) {
QUIC_BUG << ENDPOINT << "Stream " << id
<< " failed to close under OnConnectionClosed";
+ } else {
+ QUIC_BUG_IF(!it->second->IsZombie())
+ << ENDPOINT << "Non-zombie stream " << id
+ << " failed to close under OnConnectionClosed";
}
}
- } else {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_do_not_use_stream_map, 1, 2);
- PerformActionOnActiveStreams([this, frame, source](QuicStream* stream) {
- QuicStreamId id = stream->id();
- stream->OnConnectionClosed(frame.quic_error_code, source);
- auto it = stream_map_.find(id);
- if (it != stream_map_.end()) {
- if (!remove_zombie_streams_) {
- QUIC_BUG << ENDPOINT << "Stream " << id
- << " failed to close under OnConnectionClosed";
- } else {
- QUIC_BUG_IF(!it->second->IsZombie())
- << ENDPOINT << "Non-zombie stream " << id
- << " failed to close under OnConnectionClosed";
- }
- }
- return true;
- });
- }
+ return true;
+ });
if (!remove_zombie_streams_) {
// Cleanup zombie stream map on connection close.
diff --git a/quic/core/quic_session.h b/quic/core/quic_session.h
index 7a8c2c1..6f83430 100644
--- a/quic/core/quic_session.h
+++ b/quic/core/quic_session.h
@@ -618,8 +618,6 @@
bool was_zero_rtt_rejected() const { return was_zero_rtt_rejected_; }
- bool do_not_use_stream_map() const { return do_not_use_stream_map_; }
-
size_t num_outgoing_draining_streams() const {
return num_outgoing_draining_streams_;
}
@@ -847,9 +845,6 @@
// creation of new outgoing bidirectional streams.
bool liveness_testing_in_progress_;
- // Latched value of flag quic_do_not_use_stream_map.
- const bool do_not_use_stream_map_;
-
// Latched value of flag quic_remove_zombie_streams.
const bool remove_zombie_streams_;
};