gfe-relnote: Roll forward the deprecation of gfe2_reloadable_flag_quic_enable_version_46 as this does not cause b3m prober failure anymore. PiperOrigin-RevId: 252884492 Change-Id: I48ae9cf10574a816ed9fb5e3c49555fabf5a2b00
diff --git a/quic/core/quic_dispatcher_test.cc b/quic/core/quic_dispatcher_test.cc index e95ee98..87742db 100644 --- a/quic/core/quic_dispatcher_test.cc +++ b/quic/core/quic_dispatcher_test.cc
@@ -879,7 +879,6 @@ static_assert(QUIC_ARRAYSIZE(kSupportedTransportVersions) == 6u, "Supported versions out of sync"); SetQuicReloadableFlag(quic_disable_version_39, false); - SetQuicReloadableFlag(quic_enable_version_46, true); SetQuicReloadableFlag(quic_enable_version_47, true); SetQuicReloadableFlag(quic_enable_version_99, true); QuicSocketAddress client_address(QuicIpAddress::Loopback4(), 1); @@ -964,39 +963,6 @@ SerializeCHLO(), CONNECTION_ID_PRESENT, PACKET_4BYTE_PACKET_NUMBER, 1); - // Turn off version 46. - SetQuicReloadableFlag(quic_enable_version_46, false); - connection_id = TestConnectionId(++conn_id); - EXPECT_CALL(*dispatcher_, CreateQuicSession(connection_id, client_address, - QuicStringPiece("hq"), _)) - .Times(0); - ProcessPacket(client_address, connection_id, true, - ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_46), - SerializeCHLO(), CONNECTION_ID_PRESENT, - PACKET_4BYTE_PACKET_NUMBER, 1); - - // Turn on version 46. - SetQuicReloadableFlag(quic_enable_version_46, true); - connection_id = TestConnectionId(++conn_id); - EXPECT_CALL(*dispatcher_, CreateQuicSession(connection_id, client_address, - QuicStringPiece("hq"), _)) - .WillOnce(testing::Return(CreateSession( - dispatcher_.get(), config_, connection_id, client_address, - &mock_helper_, &mock_alarm_factory_, &crypto_config_, - QuicDispatcherPeer::GetCache(dispatcher_.get()), &session1_))); - EXPECT_CALL(*reinterpret_cast<MockQuicConnection*>(session1_->connection()), - ProcessUdpPacket(_, _, _)) - .WillOnce(WithArg<2>( - Invoke([this, connection_id](const QuicEncryptedPacket& packet) { - ValidatePacket(connection_id, packet); - }))); - EXPECT_CALL(*dispatcher_, - ShouldCreateOrBufferPacketForConnection(connection_id, _)); - ProcessPacket(client_address, connection_id, true, - ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_46), - SerializeCHLO(), CONNECTION_ID_PRESENT, - PACKET_4BYTE_PACKET_NUMBER, 1); - // Turn off version 39. SetQuicReloadableFlag(quic_disable_version_39, true); connection_id = TestConnectionId(++conn_id);
diff --git a/quic/core/quic_version_manager.cc b/quic/core/quic_version_manager.cc index cde3664..045e38c 100644 --- a/quic/core/quic_version_manager.cc +++ b/quic/core/quic_version_manager.cc
@@ -16,7 +16,6 @@ ParsedQuicVersionVector supported_versions) : enable_version_99_(GetQuicReloadableFlag(quic_enable_version_99)), enable_version_47_(GetQuicReloadableFlag(quic_enable_version_47)), - enable_version_46_(GetQuicReloadableFlag(quic_enable_version_46)), disable_version_39_(GetQuicReloadableFlag(quic_disable_version_39)), enable_tls_(GetQuicFlag(FLAGS_quic_supports_tls_handshake)), allowed_supported_versions_(std::move(supported_versions)) { @@ -39,12 +38,10 @@ void QuicVersionManager::MaybeRefilterSupportedVersions() { if (enable_version_99_ != GetQuicReloadableFlag(quic_enable_version_99) || enable_version_47_ != GetQuicReloadableFlag(quic_enable_version_47) || - enable_version_46_ != GetQuicReloadableFlag(quic_enable_version_46) || disable_version_39_ != GetQuicReloadableFlag(quic_disable_version_39) || enable_tls_ != GetQuicFlag(FLAGS_quic_supports_tls_handshake)) { enable_version_99_ = GetQuicReloadableFlag(quic_enable_version_99); enable_version_47_ = GetQuicReloadableFlag(quic_enable_version_47); - enable_version_46_ = GetQuicReloadableFlag(quic_enable_version_46); disable_version_39_ = GetQuicReloadableFlag(quic_disable_version_39); enable_tls_ = GetQuicFlag(FLAGS_quic_supports_tls_handshake); RefilterSupportedVersions();
diff --git a/quic/core/quic_version_manager.h b/quic/core/quic_version_manager.h index a865be6..71a285a 100644 --- a/quic/core/quic_version_manager.h +++ b/quic/core/quic_version_manager.h
@@ -42,8 +42,6 @@ bool enable_version_99_; // quic_enable_version_47 flag bool enable_version_47_; - // quic_enable_version_46 flag - bool enable_version_46_; // quic_disable_version_39 flag bool disable_version_39_; // quic_supports_tls_handshake flag
diff --git a/quic/core/quic_version_manager_test.cc b/quic/core/quic_version_manager_test.cc index d65bd71..cf3ff5a 100644 --- a/quic/core/quic_version_manager_test.cc +++ b/quic/core/quic_version_manager_test.cc
@@ -20,22 +20,17 @@ "Supported versions out of sync"); SetQuicReloadableFlag(quic_enable_version_99, false); SetQuicReloadableFlag(quic_enable_version_47, false); - SetQuicReloadableFlag(quic_enable_version_46, false); SetQuicReloadableFlag(quic_disable_version_39, true); QuicVersionManager manager(AllSupportedVersions()); EXPECT_EQ(FilterSupportedTransportVersions(AllSupportedTransportVersions()), manager.GetSupportedTransportVersions()); - EXPECT_EQ(QuicTransportVersionVector({QUIC_VERSION_44, QUIC_VERSION_43}), + EXPECT_EQ(QuicTransportVersionVector( + {QUIC_VERSION_46, QUIC_VERSION_44, QUIC_VERSION_43}), manager.GetSupportedTransportVersions()); SetQuicReloadableFlag(quic_disable_version_39, false); - EXPECT_EQ(QuicTransportVersionVector( - {QUIC_VERSION_44, QUIC_VERSION_43, QUIC_VERSION_39}), - manager.GetSupportedTransportVersions()); - - SetQuicReloadableFlag(quic_enable_version_46, true); EXPECT_EQ(QuicTransportVersionVector({QUIC_VERSION_46, QUIC_VERSION_44, QUIC_VERSION_43, QUIC_VERSION_39}), manager.GetSupportedTransportVersions());
diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc index 6500260..87f34de 100644 --- a/quic/core/quic_versions.cc +++ b/quic/core/quic_versions.cc
@@ -230,17 +230,11 @@ } if (version.transport_version == QUIC_VERSION_99) { if (GetQuicReloadableFlag(quic_enable_version_99) && - GetQuicReloadableFlag(quic_enable_version_47) && - GetQuicReloadableFlag(quic_enable_version_46)) { + GetQuicReloadableFlag(quic_enable_version_47)) { filtered_versions.push_back(version); } } else if (version.transport_version == QUIC_VERSION_47) { - if (GetQuicReloadableFlag(quic_enable_version_47) && - GetQuicReloadableFlag(quic_enable_version_46)) { - filtered_versions.push_back(version); - } - } else if (version.transport_version == QUIC_VERSION_46) { - if (GetQuicReloadableFlag(quic_enable_version_46)) { + if (GetQuicReloadableFlag(quic_enable_version_47)) { filtered_versions.push_back(version); } } else if (version.transport_version == QUIC_VERSION_39) { @@ -449,9 +443,6 @@ if (parsed_version.transport_version >= QUIC_VERSION_47) { SetQuicReloadableFlag(quic_enable_version_47, true); } - if (parsed_version.transport_version >= QUIC_VERSION_46) { - SetQuicReloadableFlag(quic_enable_version_46, true); - } } #undef RETURN_STRING_LITERAL // undef for jumbo builds
diff --git a/quic/core/quic_versions_test.cc b/quic/core/quic_versions_test.cc index 2aaf0f0..6809ba1 100644 --- a/quic/core/quic_versions_test.cc +++ b/quic/core/quic_versions_test.cc
@@ -282,7 +282,6 @@ TEST_F(QuicVersionsTest, FilterSupportedTransportVersionsAllVersions) { QuicTransportVersionVector all_versions = AllSupportedTransportVersions(); SetQuicReloadableFlag(quic_disable_version_39, false); - SetQuicReloadableFlag(quic_enable_version_46, true); SetQuicReloadableFlag(quic_enable_version_47, true); SetQuicReloadableFlag(quic_enable_version_99, true); ParsedQuicVersionVector parsed_versions; @@ -305,7 +304,6 @@ TEST_F(QuicVersionsTest, FilterSupportedTransportVersionsNo99) { QuicTransportVersionVector all_versions = AllSupportedTransportVersions(); SetQuicReloadableFlag(quic_disable_version_39, false); - SetQuicReloadableFlag(quic_enable_version_46, true); SetQuicReloadableFlag(quic_enable_version_47, true); SetQuicReloadableFlag(quic_enable_version_99, false); ParsedQuicVersionVector parsed_versions; @@ -328,7 +326,6 @@ TEST_F(QuicVersionsTest, FilterSupportedTransportVersionsNo47) { QuicTransportVersionVector all_versions = AllSupportedTransportVersions(); SetQuicReloadableFlag(quic_disable_version_39, false); - SetQuicReloadableFlag(quic_enable_version_46, true); SetQuicReloadableFlag(quic_enable_version_47, false); SetQuicReloadableFlag(quic_enable_version_99, false); ParsedQuicVersionVector parsed_versions; @@ -347,10 +344,9 @@ ASSERT_EQ(expected_parsed_versions, FilterSupportedVersions(parsed_versions)); } -TEST_F(QuicVersionsTest, FilterSupportedTransportVersionsNo46) { +TEST_F(QuicVersionsTest, FilterSupportedTransportVersionsNo39) { QuicTransportVersionVector all_versions = AllSupportedTransportVersions(); - SetQuicReloadableFlag(quic_disable_version_39, false); - SetQuicReloadableFlag(quic_enable_version_46, false); + SetQuicReloadableFlag(quic_disable_version_39, true); SetQuicReloadableFlag(quic_enable_version_47, false); SetQuicReloadableFlag(quic_enable_version_99, false); ParsedQuicVersionVector parsed_versions; @@ -358,29 +354,7 @@ parsed_versions.push_back(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, version)); } QuicTransportVersionVector expected_versions = { - QUIC_VERSION_44, QUIC_VERSION_43, QUIC_VERSION_39}; - ParsedQuicVersionVector expected_parsed_versions; - for (QuicTransportVersion version : expected_versions) { - expected_parsed_versions.push_back( - ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, version)); - } - - ASSERT_EQ(expected_versions, FilterSupportedTransportVersions(all_versions)); - ASSERT_EQ(expected_parsed_versions, FilterSupportedVersions(parsed_versions)); -} - -TEST_F(QuicVersionsTest, FilterSupportedTransportVersionsNo39) { - QuicTransportVersionVector all_versions = AllSupportedTransportVersions(); - SetQuicReloadableFlag(quic_disable_version_39, true); - SetQuicReloadableFlag(quic_enable_version_46, false); - SetQuicReloadableFlag(quic_enable_version_47, false); - SetQuicReloadableFlag(quic_enable_version_99, false); - ParsedQuicVersionVector parsed_versions; - for (QuicTransportVersion version : all_versions) { - parsed_versions.push_back(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, version)); - } - QuicTransportVersionVector expected_versions = {QUIC_VERSION_44, - QUIC_VERSION_43}; + QUIC_VERSION_46, QUIC_VERSION_44, QUIC_VERSION_43}; ParsedQuicVersionVector expected_parsed_versions; for (QuicTransportVersion version : expected_versions) { expected_parsed_versions.push_back( @@ -488,7 +462,6 @@ ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_99); SetQuicFlag(FLAGS_quic_supports_tls_handshake, false); SetQuicReloadableFlag(quic_disable_version_39, false); - SetQuicReloadableFlag(quic_enable_version_46, true); SetQuicReloadableFlag(quic_enable_version_47, false); SetQuicReloadableFlag(quic_enable_version_99, false);
diff --git a/quic/quartc/quartc_endpoint_test.cc b/quic/quartc/quartc_endpoint_test.cc index 5f8c25d..6b56b1a 100644 --- a/quic/quartc/quartc_endpoint_test.cc +++ b/quic/quartc/quartc_endpoint_test.cc
@@ -80,11 +80,6 @@ // attempts to connect using a newer version. TEST_F(QuartcEndpointTest, QUIC_TEST_DISABLED_IN_CHROME(ServerNegotiatesForOldVersion)) { - // Note: for this test, we need support for two versions. Which two shouldn't - // matter, but they must be enabled so that the version manager doesn't filter - // them out. - SetQuicReloadableFlag(quic_enable_version_46, true); - // Reset the client endpoint to prefer version 46 but also be capable of // speaking version 43. ParsedQuicVersionVector client_versions; @@ -126,11 +121,6 @@ // QUIC versions. TEST_F(QuartcEndpointTest, QUIC_TEST_DISABLED_IN_CHROME(ServerAcceptsOldVersion)) { - // Note: for this test, we need support for two versions. Which two shouldn't - // matter, but they must be enabled so that the version manager doesn't filter - // them out. - SetQuicReloadableFlag(quic_enable_version_46, true); - // Reset the client endpoint to only speak version 43. ParsedQuicVersionVector client_versions; client_versions.push_back({PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_43}); @@ -172,11 +162,6 @@ // completely disjoint sets of versions. TEST_F(QuartcEndpointTest, QUIC_TEST_DISABLED_IN_CHROME(VersionNegotiationWithDisjointVersions)) { - // Note: for this test, we need support for two versions. Which two shouldn't - // matter, but they must be enabled so that the version manager doesn't filter - // them out. - SetQuicReloadableFlag(quic_enable_version_46, true); - // Reset the client endpoint to only speak version 43. ParsedQuicVersionVector client_versions; client_versions.push_back({PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_43}); @@ -219,11 +204,6 @@ // version negotiation fails. SetQuicReloadableFlag(quic_no_client_conn_ver_negotiation, true); - // Note: for this test, we need support for two versions. Which two shouldn't - // matter, but they must be enabled so that the version manager doesn't filter - // them out. - SetQuicReloadableFlag(quic_enable_version_46, true); - // Reset the client endpoint to prefer version 46 but also be capable of // speaking version 43. ParsedQuicVersionVector client_versions;
diff --git a/quic/quartc/quartc_factory.cc b/quic/quartc/quartc_factory.cc index b75244c..a0affb5 100644 --- a/quic/quartc/quartc_factory.cc +++ b/quic/quartc/quartc_factory.cc
@@ -62,9 +62,6 @@ // Fix b/110259444. SetQuicReloadableFlag(quic_fix_spurious_ack_alarm, true); - // Enable version 46 to enable SendMessage API and 'quic bit' per draft 17. - SetQuicReloadableFlag(quic_enable_version_46, true); - // Enable version 47 to enable variable-length connection ids. SetQuicReloadableFlag(quic_enable_version_47, true); @@ -101,7 +98,7 @@ // In exoblaze this may return false. DCHECK to avoid problems caused by // incorrect flags configuration. - DCHECK(GetQuicReloadableFlag(quic_enable_version_46)) + DCHECK(GetQuicReloadableFlag(quic_enable_version_47)) << "Your build does not support quic reloadable flags and shouldn't " "place Quartc calls";