commit 615f13b856cfa17bc8599fd9a3554e3bff267c4c
author renjietang <renjietang@google.com> Mon May 06 17:08:02 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 07 07:22:01 2019 -0700
tree aa5c0cd36750219dc6dc94a216e8cfacd45abdab
parent e0df3f7007a2d0bc68d3bcde617936a652377c75

Use a QuicSession member to latch
gfe2_reloadable_flag_quic_eliminate_static_stream_map_2.

This prevents unexpected behavior from runtime flag flipping.

gfe-relnote: gfe2_reloadable_flag_quic_eliminate_static_stream_map_2 replaces
gfe2_reloadable_flag_quic_eliminate_static_stream_map for rollout purposes.
PiperOrigin-RevId: 246926123
Change-Id: I11103af393e7fa93ea5b2d3cd90f9fe423fbed96

quic/core/http/quic_spdy_session.cc

diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc
index cc1eee7..de34250 100644
--- a/quic/core/http/quic_spdy_session.cc
+++ b/quic/core/http/quic_spdy_session.cc
@@ -355,12 +355,12 @@
   headers_stream_ = QuicMakeUnique<QuicHeadersStream>((this));
   DCHECK_EQ(QuicUtils::GetHeadersStreamId(connection()->transport_version()),
             headers_stream_->id());
-  if (!GetQuicReloadableFlag(quic_eliminate_static_stream_map)) {
+  if (!eliminate_static_stream_map()) {
     RegisterStaticStream(
         QuicUtils::GetHeadersStreamId(connection()->transport_version()),
         headers_stream_.get());
   } else {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_eliminate_static_stream_map, 7, 15);
+    QUIC_RELOADABLE_FLAG_COUNT_N(quic_eliminate_static_stream_map_2, 7, 17);
     unowned_headers_stream_ = headers_stream_.get();
     RegisterStaticStreamNew(std::move(headers_stream_));
   }
@@ -444,9 +444,8 @@
     // It's quite possible to receive headers after a stream has been reset.
     return;
   }
-  if (GetQuicReloadableFlag(quic_eliminate_static_stream_map) &&
-      stream->is_static()) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_eliminate_static_stream_map, 8, 15);
+  if (eliminate_static_stream_map() && stream->is_static()) {
+    QUIC_RELOADABLE_FLAG_COUNT_N(quic_eliminate_static_stream_map_2, 8, 17);
     connection()->CloseConnection(
         QUIC_INVALID_HEADERS_STREAM_DATA, "stream is static",
         ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
@@ -709,13 +708,13 @@
 }
 
 bool QuicSpdySession::HasActiveRequestStreams() const {
-  if (!GetQuicReloadableFlag(quic_eliminate_static_stream_map)) {
+  if (!eliminate_static_stream_map()) {
     return !dynamic_streams().empty();
   }
   // In the case where session is destructed by calling
   // dynamic_streams().clear(), we will have incorrect accounting here.
   // TODO(renjietang): Modify destructors and make this a DCHECK.
-  QUIC_RELOADABLE_FLAG_COUNT_N(quic_eliminate_static_stream_map, 9, 15);
+  QUIC_RELOADABLE_FLAG_COUNT_N(quic_eliminate_static_stream_map_2, 9, 17);
   if (static_cast<size_t>(dynamic_streams().size()) >
       num_incoming_static_streams() + num_outgoing_static_streams()) {
     return dynamic_streams().size() - num_incoming_static_streams() -