commit 28c1bf3e834a8395ae761f5a59fcc96158bb54c4
author dschinazi <dschinazi@google.com> Mon Aug 19 11:54:46 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Aug 19 18:08:13 2019 -0700
tree 727c11ec66430e6443990cf5e17f614e78f3dd45
parent d6f5afacf6d104686b6e544cc2c20de0668cc371

Deprecate quic_deterministic_replacement_connection_ids

This flag is no longer needed because the only enabled version that used this functionality was v48 and we've now disabled v48 everywhere.

gfe-relnote: deprecate gfe2_restart_flag_quic_deterministic_replacement_connection_ids
PiperOrigin-RevId: 264208070
Change-Id: Ice12cb225308bdfa70eddf7879e043a220f776e2

quic/core/quic_dispatcher.cc

diff --git a/quic/core/quic_dispatcher.cc b/quic/core/quic_dispatcher.cc
index 553fcd4..cb81f05 100644
--- a/quic/core/quic_dispatcher.cc
+++ b/quic/core/quic_dispatcher.cc
@@ -306,28 +306,14 @@
   DCHECK(QuicUtils::VariableLengthConnectionIdAllowedForVersion(
       version.transport_version));
 
-  if (!GetQuicRestartFlag(quic_deterministic_replacement_connection_ids)) {
-    auto it = connection_id_map_.find(server_connection_id);
-    if (it != connection_id_map_.end()) {
-      return it->second;
-    }
-  } else {
-    // TODO(dschinazi) Remove QuicDispatcher::connection_id_map_ entirely
-    // when quic_deterministic_replacement_connection_ids is deprecated.
-    QUIC_RESTART_FLAG_COUNT_N(quic_deterministic_replacement_connection_ids, 1,
-                              2);
-  }
   QuicConnectionId new_connection_id =
       GenerateNewServerConnectionId(version, server_connection_id);
   DCHECK_EQ(expected_server_connection_id_length_, new_connection_id.length());
-  if (!GetQuicRestartFlag(quic_deterministic_replacement_connection_ids)) {
-    connection_id_map_.insert(
-        std::make_pair(server_connection_id, new_connection_id));
-  } else {
-    // Verify that GenerateNewServerConnectionId is deterministic.
-    DCHECK_EQ(new_connection_id,
-              GenerateNewServerConnectionId(version, server_connection_id));
-  }
+
+  // Verify that GenerateNewServerConnectionId is deterministic.
+  DCHECK_EQ(new_connection_id,
+            GenerateNewServerConnectionId(version, server_connection_id));
+
   QUIC_DLOG(INFO) << "Replacing incoming connection ID " << server_connection_id
                   << " with " << new_connection_id;
   return new_connection_id;
@@ -336,13 +322,6 @@
 QuicConnectionId QuicDispatcher::GenerateNewServerConnectionId(
     ParsedQuicVersion /*version*/,
     QuicConnectionId connection_id) const {
-  if (!GetQuicRestartFlag(quic_deterministic_replacement_connection_ids)) {
-    return QuicUtils::CreateRandomConnectionId();
-  }
-
-  QUIC_RESTART_FLAG_COUNT_N(quic_deterministic_replacement_connection_ids, 2,
-                            2);
-
   return QuicUtils::CreateReplacementConnectionId(connection_id);
 }