Deprecate quic_enable_version_49 jobuckley@ please take a look at the vr/c9 code. This should be a no-op that ensures you still avoid using v49+ versions without leveraging the flags we are removing. gfe-relnote: deprecate gfe2_reloadable_flag_quic_enable_version_49 PiperOrigin-RevId: 282659524 Change-Id: I6e02b6f4298f174a29d02fae904896ddb016681b
diff --git a/quic/core/quic_dispatcher_test.cc b/quic/core/quic_dispatcher_test.cc index f8c07dc..a05dd09 100644 --- a/quic/core/quic_dispatcher_test.cc +++ b/quic/core/quic_dispatcher_test.cc
@@ -933,7 +933,6 @@ TEST_F(QuicDispatcherTest, SupportedTransportVersionsChangeInFlight) { static_assert(QUIC_ARRAYSIZE(kSupportedTransportVersions) == 6u, "Supported versions out of sync"); - SetQuicReloadableFlag(quic_enable_version_49, true); SetQuicReloadableFlag(quic_enable_version_50, true); SetQuicReloadableFlag(quic_enable_version_99, true); @@ -952,16 +951,6 @@ SetQuicReloadableFlag(quic_enable_version_50, true); VerifyVersionSupported( ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50)); - - // Turn off version 49. - SetQuicReloadableFlag(quic_enable_version_49, false); - VerifyVersionNotSupported( - ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_49)); - - // Turn on version 49. - SetQuicReloadableFlag(quic_enable_version_49, true); - VerifyVersionSupported( - ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_49)); } TEST_F(QuicDispatcherTest, RejectDeprecatedVersionsWithVersionNegotiation) {
diff --git a/quic/core/quic_version_manager.cc b/quic/core/quic_version_manager.cc index d9bc268..476bbc7 100644 --- a/quic/core/quic_version_manager.cc +++ b/quic/core/quic_version_manager.cc
@@ -17,7 +17,6 @@ ParsedQuicVersionVector supported_versions) : enable_version_99_(GetQuicReloadableFlag(quic_enable_version_99)), enable_version_50_(GetQuicReloadableFlag(quic_enable_version_50)), - enable_version_49_(GetQuicReloadableFlag(quic_enable_version_49)), enable_tls_(GetQuicReloadableFlag(quic_supports_tls_handshake)), allowed_supported_versions_(std::move(supported_versions)) { static_assert(QUIC_ARRAYSIZE(kSupportedTransportVersions) == 6u, @@ -43,11 +42,9 @@ "Supported versions out of sync"); if (enable_version_99_ != GetQuicReloadableFlag(quic_enable_version_99) || enable_version_50_ != GetQuicReloadableFlag(quic_enable_version_50) || - enable_version_49_ != GetQuicReloadableFlag(quic_enable_version_49) || enable_tls_ != GetQuicReloadableFlag(quic_supports_tls_handshake)) { enable_version_99_ = GetQuicReloadableFlag(quic_enable_version_99); enable_version_50_ = GetQuicReloadableFlag(quic_enable_version_50); - enable_version_49_ = GetQuicReloadableFlag(quic_enable_version_49); enable_tls_ = GetQuicReloadableFlag(quic_supports_tls_handshake); RefilterSupportedVersions(); }
diff --git a/quic/core/quic_version_manager.h b/quic/core/quic_version_manager.h index 79e5898..0851464 100644 --- a/quic/core/quic_version_manager.h +++ b/quic/core/quic_version_manager.h
@@ -45,8 +45,6 @@ bool enable_version_99_; // quic_enable_version_50 flag bool enable_version_50_; - // quic_enable_version_49 flag - bool enable_version_49_; // quic_supports_tls_handshake flag bool enable_tls_;
diff --git a/quic/core/quic_version_manager_test.cc b/quic/core/quic_version_manager_test.cc index a01316f..48623a8 100644 --- a/quic/core/quic_version_manager_test.cc +++ b/quic/core/quic_version_manager_test.cc
@@ -20,17 +20,11 @@ "Supported versions out of sync"); SetQuicReloadableFlag(quic_enable_version_99, false); SetQuicReloadableFlag(quic_enable_version_50, false); - SetQuicReloadableFlag(quic_enable_version_49, false); QuicVersionManager manager(AllSupportedVersions()); EXPECT_EQ(FilterSupportedTransportVersions(AllSupportedTransportVersions()), manager.GetSupportedTransportVersions()); - EXPECT_EQ(QuicTransportVersionVector( - {QUIC_VERSION_48, QUIC_VERSION_46, QUIC_VERSION_43}), - manager.GetSupportedTransportVersions()); - - SetQuicReloadableFlag(quic_enable_version_49, true); EXPECT_EQ(QuicTransportVersionVector({QUIC_VERSION_49, QUIC_VERSION_48, QUIC_VERSION_46, QUIC_VERSION_43}), manager.GetSupportedTransportVersions());
diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc index b68c988..5b9e8f1 100644 --- a/quic/core/quic_versions.cc +++ b/quic/core/quic_versions.cc
@@ -270,10 +270,6 @@ if (GetQuicReloadableFlag(quic_enable_version_50)) { filtered_versions.push_back(version); } - } else if (version.transport_version == QUIC_VERSION_49) { - if (GetQuicReloadableFlag(quic_enable_version_49)) { - filtered_versions.push_back(version); - } } else { filtered_versions.push_back(version); } @@ -478,9 +474,6 @@ if (parsed_version.transport_version == QUIC_VERSION_50) { SetQuicReloadableFlag(quic_enable_version_50, true); } - if (parsed_version.transport_version == QUIC_VERSION_49) { - SetQuicReloadableFlag(quic_enable_version_49, 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 02aa15f..283113f 100644 --- a/quic/core/quic_versions_test.cc +++ b/quic/core/quic_versions_test.cc
@@ -280,7 +280,6 @@ QuicTransportVersionVector all_versions = AllSupportedTransportVersions(); static_assert(QUIC_ARRAYSIZE(kSupportedTransportVersions) == 6u, "Supported versions out of sync"); - SetQuicReloadableFlag(quic_enable_version_49, true); SetQuicReloadableFlag(quic_enable_version_50, true); SetQuicReloadableFlag(quic_enable_version_99, true); ParsedQuicVersionVector parsed_versions; @@ -304,7 +303,6 @@ QuicTransportVersionVector all_versions = AllSupportedTransportVersions(); static_assert(QUIC_ARRAYSIZE(kSupportedTransportVersions) == 6u, "Supported versions out of sync"); - SetQuicReloadableFlag(quic_enable_version_49, true); SetQuicReloadableFlag(quic_enable_version_50, true); SetQuicReloadableFlag(quic_enable_version_99, false); ParsedQuicVersionVector parsed_versions; @@ -326,7 +324,6 @@ TEST_F(QuicVersionsTest, FilterSupportedTransportVersionsNo50) { QuicTransportVersionVector all_versions = AllSupportedTransportVersions(); - SetQuicReloadableFlag(quic_enable_version_49, true); SetQuicReloadableFlag(quic_enable_version_50, false); SetQuicReloadableFlag(quic_enable_version_99, false); ParsedQuicVersionVector parsed_versions; @@ -345,34 +342,10 @@ ASSERT_EQ(expected_parsed_versions, FilterSupportedVersions(parsed_versions)); } -TEST_F(QuicVersionsTest, FilterSupportedTransportVersionsNo49) { - QuicTransportVersionVector all_versions = AllSupportedTransportVersions(); - static_assert(QUIC_ARRAYSIZE(kSupportedTransportVersions) == 6u, - "Supported versions out of sync"); - SetQuicReloadableFlag(quic_enable_version_49, false); - SetQuicReloadableFlag(quic_enable_version_50, 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_48, QUIC_VERSION_46, QUIC_VERSION_43}; - 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, FilterSupportedTransportVersionsNoFlags) { QuicTransportVersionVector all_versions = AllSupportedTransportVersions(); static_assert(QUIC_ARRAYSIZE(kSupportedTransportVersions) == 6u, "Supported versions out of sync"); - SetQuicReloadableFlag(quic_enable_version_49, false); SetQuicReloadableFlag(quic_enable_version_50, false); SetQuicReloadableFlag(quic_enable_version_99, false); ParsedQuicVersionVector parsed_versions; @@ -380,7 +353,7 @@ parsed_versions.push_back(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, version)); } QuicTransportVersionVector expected_versions = { - QUIC_VERSION_48, QUIC_VERSION_46, QUIC_VERSION_43}; + QUIC_VERSION_49, QUIC_VERSION_48, QUIC_VERSION_46, QUIC_VERSION_43}; ParsedQuicVersionVector expected_parsed_versions; for (QuicTransportVersion version : expected_versions) { expected_parsed_versions.push_back( @@ -473,10 +446,6 @@ static_assert(QUIC_ARRAYSIZE(kSupportedTransportVersions) == 6u, "Supported versions out of sync"); SetQuicReloadableFlag(quic_supports_tls_handshake, true); - ParsedQuicVersion parsed_version_q049 = - ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_49); - ParsedQuicVersion parsed_version_t049 = - ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_49); ParsedQuicVersion parsed_version_q050 = ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50); ParsedQuicVersion parsed_version_t050 = @@ -484,7 +453,6 @@ ParsedQuicVersion parsed_version_t099 = ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_99); SetQuicReloadableFlag(quic_supports_tls_handshake, false); - SetQuicReloadableFlag(quic_enable_version_49, false); SetQuicReloadableFlag(quic_enable_version_50, false); SetQuicReloadableFlag(quic_enable_version_99, false); @@ -506,22 +474,6 @@ { QuicFlagSaver flag_saver; - QuicEnableVersion(parsed_version_q049); - EXPECT_FALSE(GetQuicReloadableFlag(quic_supports_tls_handshake)); - EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_49)); - EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_99)); - } - - { - QuicFlagSaver flag_saver; - QuicEnableVersion(parsed_version_t049); - EXPECT_TRUE(GetQuicReloadableFlag(quic_supports_tls_handshake)); - EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_49)); - EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_99)); - } - - { - QuicFlagSaver flag_saver; QuicEnableVersion(parsed_version_t099); EXPECT_TRUE(GetQuicReloadableFlag(quic_supports_tls_handshake)); EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_50));