Remove stream counting for pending streams.
The direct reason for this CL is that num_dynamic_incoming_streams_ is only decremented but not incremented for pending streams. This will result in incorrect accounting of streams.
But in general, pending streams are not known to be dynamic or static, so we shouldn't count them before activating them.
gfe-relnote: v99 only, not used in prod.
PiperOrigin-RevId: 258493376
Change-Id: Id68e0f9a69dbb6101f2cf817afe0f111cc19ba07
diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index b2d0bce..7fa925d 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -890,13 +890,9 @@
pending_stream_map_.erase(stream_id);
}
- --num_dynamic_incoming_streams_;
-
if (VersionHasIetfQuicFrames(connection_->transport_version())) {
v99_streamid_manager_.OnStreamClosed(stream_id);
}
-
- OnCanCreateNewOutgoingStream();
}
void QuicSession::OnFinalByteOffsetReceived(
diff --git a/quic/core/quic_session_test.cc b/quic/core/quic_session_test.cc
index 49316dd..ebb17b9 100644
--- a/quic/core/quic_session_test.cc
+++ b/quic/core/quic_session_test.cc
@@ -1739,8 +1739,8 @@
QuicStreamFrame data1(stream_id, true, 10, QuicStringPiece("HT"));
session_.OnStreamFrame(data1);
EXPECT_EQ(0, session_.num_incoming_streams_created());
+ EXPECT_EQ(0u, session_.GetNumOpenIncomingStreams());
- EXPECT_CALL(session_, OnCanCreateNewOutgoingStream()).Times(1);
EXPECT_CALL(*connection_, SendControlFrame(_)).Times(1);
EXPECT_CALL(*connection_, OnStreamReset(stream_id, QUIC_RST_ACKNOWLEDGEMENT))
.Times(1);
@@ -1748,10 +1748,12 @@
QUIC_ERROR_PROCESSING_STREAM, 12);
session_.OnRstStream(rst1);
EXPECT_EQ(0, session_.num_incoming_streams_created());
+ EXPECT_EQ(0u, session_.GetNumOpenIncomingStreams());
QuicStreamFrame data2(stream_id, false, 0, QuicStringPiece("HT"));
session_.OnStreamFrame(data2);
EXPECT_EQ(0, session_.num_incoming_streams_created());
+ EXPECT_EQ(0u, session_.GetNumOpenIncomingStreams());
}
TEST_P(QuicSessionTestServer, PendingStreamOnWindowUpdate) {
