commit 095aafa4c48626c14d298e10fd7b7c8b57a9b6f6
author haoyuewang <haoyuewang@google.com> Tue Aug 10 08:10:40 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Aug 10 08:11:20 2021 -0700
tree 5faecf315ad8afe6d15ac4cf191c0ddf01bf2436
parent f170cadcd7d30a33bfa4880ec1e2ed20e8a57e36

Deprecate --gfe2_reloadable_flag_quic_connection_support_multiple_cids_v4

PiperOrigin-RevId: 389886837

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 0e309e2..e559110 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -338,8 +338,7 @@
       version().HasIetfQuicFrames() &&
       GetQuicRestartFlag(quic_time_wait_list_support_multiple_cid_v2) &&
       GetQuicRestartFlag(
-          quic_dispatcher_support_multiple_cid_per_connection_v2) &&
-      GetQuicReloadableFlag(quic_connection_support_multiple_cids_v4);
+          quic_dispatcher_support_multiple_cid_per_connection_v2);
 
   QUIC_DLOG(INFO) << ENDPOINT << "Created connection with server connection ID "
                   << server_connection_id
@@ -2043,7 +2042,6 @@
   if (perspective_ == Perspective::IS_SERVER) {
     OnClientConnectionIdAvailable();
   }
-  QUIC_RELOADABLE_FLAG_COUNT_N(quic_connection_support_multiple_cids_v4, 1, 2);
   if (ack_cid_frames_) {
     QUIC_RELOADABLE_FLAG_COUNT_N(quic_ack_cid_frames, 1, 2);
     MaybeUpdateAckTimeout();
@@ -2105,7 +2103,6 @@
                     ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
     return false;
   }
-  QUIC_RELOADABLE_FLAG_COUNT_N(quic_connection_support_multiple_cids_v4, 2, 2);
   // Count successfully received RETIRE_CONNECTION_ID frames.
   QUIC_RELOADABLE_FLAG_COUNT_N(quic_connection_migration_use_new_cid_v2, 5, 6);
   if (ack_cid_frames_) {

quic/core/quic_flags_list.h

diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index b57fad2..3530ba4 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -81,8 +81,6 @@
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_use_active_cid_for_session_lookup, true)
 // If true, pass the received PATH_RESPONSE payload to path validator to move forward the path validation.
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_pass_path_response_to_validator, true)
-// If true, quic connection sends/recieives NewConnectionId & RetireConnectionId frames.
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_connection_support_multiple_cids_v4, true)
 // If true, quic dispatcher discards packets with invalid server connection ID.
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_discard_packets_with_invalid_cid, true)
 // If true, quic dispatcher supports one connection to use multiple connection IDs.