commit 15093ba5655b9fb7dd487c8ad3bcc25e47feaf5b
author fayang <fayang@google.com> Wed May 12 08:30:14 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Wed May 12 08:30:55 2021 -0700
tree cf5a8c5829725460c99600e707e09ae95c3d955d
parent 30f580189551ce1fbf2a9984308eedefc2761830

Deprecate gfe2_reloadable_flag_quic_encrypted_goaway.

PiperOrigin-RevId: 373375127

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 9977288..276a7af 100644
--- a/quic/core/http/quic_spdy_session.cc
+++ b/quic/core/http/quic_spdy_session.cc
@@ -796,15 +796,12 @@
                                       const std::string& reason) {
   QUICHE_DCHECK_EQ(perspective(), Perspective::IS_SERVER);
   QUICHE_DCHECK(VersionUsesHttp3(transport_version()));
-  if (GetQuicReloadableFlag(quic_encrypted_goaway)) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_encrypted_goaway, 2, 2);
-    if (!IsEncryptionEstablished()) {
-      QUIC_CODE_COUNT(quic_h3_goaway_before_encryption_established);
-      connection()->CloseConnection(
-          error_code, reason,
-          ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
-      return;
-    }
+  if (!IsEncryptionEstablished()) {
+    QUIC_CODE_COUNT(quic_h3_goaway_before_encryption_established);
+    connection()->CloseConnection(
+        error_code, reason,
+        ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
+    return;
   }
   QuicStreamId stream_id;
 

quic/core/http/quic_spdy_session_test.cc

diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc
index c7a7bd6..29e1f6b 100644
--- a/quic/core/http/quic_spdy_session_test.cc
+++ b/quic/core/http/quic_spdy_session_test.cc
@@ -1175,7 +1175,6 @@
 }
 
 TEST_P(QuicSpdySessionTestServer, SendGoAwayWithoutEncryption) {
-  SetQuicReloadableFlag(quic_encrypted_goaway, true);
   if (VersionHasIetfQuicFrames(transport_version())) {
     // HTTP/3 GOAWAY has different semantic and thus has its own test.
     return;
@@ -1217,7 +1216,6 @@
 }
 
 TEST_P(QuicSpdySessionTestServer, SendHttp3GoAwayWithoutEncryption) {
-  SetQuicReloadableFlag(quic_encrypted_goaway, true);
   if (!VersionUsesHttp3(transport_version())) {
     return;
   }

quic/core/quic_flags_list.h

diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index f658240..2960924 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -42,7 +42,6 @@
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_enable_token_based_address_validation, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_enable_version_rfcv1, false)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_encrypted_control_frames, false)
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_encrypted_goaway, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_error_on_http3_push, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_fix_on_stream_reset, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_fix_stateless_reset, false)

quic/core/quic_session.cc

diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index 60abaf1..7146195 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -920,15 +920,12 @@
                              const std::string& reason) {
   // GOAWAY frame is not supported in IETF QUIC.
   QUICHE_DCHECK(!VersionHasIetfQuicFrames(transport_version()));
-  if (GetQuicReloadableFlag(quic_encrypted_goaway)) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_encrypted_goaway, 1, 2);
-    if (!IsEncryptionEstablished()) {
-      QUIC_CODE_COUNT(quic_goaway_before_encryption_established);
-      connection_->CloseConnection(
-          error_code, reason,
-          ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
-      return;
-    }
+  if (!IsEncryptionEstablished()) {
+    QUIC_CODE_COUNT(quic_goaway_before_encryption_established);
+    connection_->CloseConnection(
+        error_code, reason,
+        ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
+    return;
   }
   if (transport_goaway_sent_) {
     return;