Deprecate quic_enable_version_draft_29 This CL replaces quic_enable_version_draft_29 with quic_disable_version_draft_29, as per our usual process once a version has fully rolled out. quic_disable_version_draft_29 is marked as enabling_blocked_by since we plan on keeping it around for a while. Replace gfe2_reloadable_flag_quic_enable_version_draft_29 with gfe2_reloadable_flag_quic_disable_version_draft_29 which has the exact same but opposite meaning PiperOrigin-RevId: 323547779 Change-Id: I6cd8c339f30034aa3bb226253b3017305fe6671a
diff --git a/quic/core/quic_version_manager.cc b/quic/core/quic_version_manager.cc index 0563797..dc1d074 100644 --- a/quic/core/quic_version_manager.cc +++ b/quic/core/quic_version_manager.cc
@@ -15,8 +15,8 @@ QuicVersionManager::QuicVersionManager( ParsedQuicVersionVector supported_versions) - : enable_version_draft_29_( - GetQuicReloadableFlag(quic_enable_version_draft_29)), + : disable_version_draft_29_( + GetQuicReloadableFlag(quic_disable_version_draft_29)), disable_version_draft_27_( GetQuicReloadableFlag(quic_disable_version_draft_27)), disable_version_draft_25_( @@ -58,8 +58,8 @@ void QuicVersionManager::MaybeRefilterSupportedVersions() { static_assert(SupportedVersions().size() == 7u, "Supported versions out of sync"); - if (enable_version_draft_29_ != - GetQuicReloadableFlag(quic_enable_version_draft_29) || + if (disable_version_draft_29_ != + GetQuicReloadableFlag(quic_disable_version_draft_29) || disable_version_draft_27_ != GetQuicReloadableFlag(quic_disable_version_draft_27) || disable_version_draft_25_ != @@ -72,8 +72,8 @@ GetQuicReloadableFlag(quic_disable_version_q046) || disable_version_q043_ != GetQuicReloadableFlag(quic_disable_version_q043)) { - enable_version_draft_29_ = - GetQuicReloadableFlag(quic_enable_version_draft_29); + disable_version_draft_29_ = + GetQuicReloadableFlag(quic_disable_version_draft_29); disable_version_draft_27_ = GetQuicReloadableFlag(quic_disable_version_draft_27); disable_version_draft_25_ =
diff --git a/quic/core/quic_version_manager.h b/quic/core/quic_version_manager.h index d86260f..0360485 100644 --- a/quic/core/quic_version_manager.h +++ b/quic/core/quic_version_manager.h
@@ -52,8 +52,8 @@ private: // Cached value of reloadable flags. - // quic_enable_version_draft_29 flag - bool enable_version_draft_29_; + // quic_disable_version_draft_29 flag + bool disable_version_draft_29_; // quic_disable_version_draft_27 flag bool disable_version_draft_27_; // quic_disable_version_draft_25 flag
diff --git a/quic/core/quic_version_manager_test.cc b/quic/core/quic_version_manager_test.cc index 4106f60..6096806 100644 --- a/quic/core/quic_version_manager_test.cc +++ b/quic/core/quic_version_manager_test.cc
@@ -20,13 +20,12 @@ TEST_F(QuicVersionManagerTest, QuicVersionManager) { static_assert(SupportedVersions().size() == 7u, "Supported versions out of sync"); - SetQuicReloadableFlag(quic_enable_version_draft_29, false); - SetQuicReloadableFlag(quic_disable_version_draft_27, true); - SetQuicReloadableFlag(quic_disable_version_draft_25, true); - SetQuicReloadableFlag(quic_disable_version_t050, false); - SetQuicReloadableFlag(quic_disable_version_q050, false); - SetQuicReloadableFlag(quic_disable_version_q046, false); - SetQuicReloadableFlag(quic_disable_version_q043, false); + for (const ParsedQuicVersion& version : AllSupportedVersions()) { + QuicEnableVersion(version); + } + QuicDisableVersion(ParsedQuicVersion::Draft29()); + QuicDisableVersion(ParsedQuicVersion::Draft27()); + QuicDisableVersion(ParsedQuicVersion::Draft25()); QuicVersionManager manager(AllSupportedVersions()); ParsedQuicVersionVector expected_parsed_versions; @@ -48,7 +47,7 @@ EXPECT_THAT(manager.GetSupportedAlpns(), ElementsAre("h3-T050", "h3-Q050", "h3-Q046", "h3-Q043")); - SetQuicReloadableFlag(quic_enable_version_draft_29, true); + QuicEnableVersion(ParsedQuicVersion::Draft29()); expected_parsed_versions.insert(expected_parsed_versions.begin(), ParsedQuicVersion::Draft29()); EXPECT_EQ(expected_parsed_versions, manager.GetSupportedVersions()); @@ -61,7 +60,7 @@ EXPECT_THAT(manager.GetSupportedAlpns(), ElementsAre("h3-29", "h3-T050", "h3-Q050", "h3-Q046", "h3-Q043")); - SetQuicReloadableFlag(quic_disable_version_draft_27, false); + QuicEnableVersion(ParsedQuicVersion::Draft27()); expected_parsed_versions.insert( expected_parsed_versions.begin() + 1, ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_27)); @@ -76,7 +75,7 @@ ElementsAre("h3-29", "h3-27", "h3-T050", "h3-Q050", "h3-Q046", "h3-Q043")); - SetQuicReloadableFlag(quic_disable_version_draft_25, false); + QuicEnableVersion(ParsedQuicVersion::Draft25()); expected_parsed_versions.insert( expected_parsed_versions.begin() + 2, ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_25));
diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc index 149310e..57b64ae 100644 --- a/quic/core/quic_versions.cc +++ b/quic/core/quic_versions.cc
@@ -45,7 +45,7 @@ const bool enable = should_enable; const bool disable = !should_enable; if (version == ParsedQuicVersion::Draft29()) { - SetQuicReloadableFlag(quic_enable_version_draft_29, enable); + SetQuicReloadableFlag(quic_disable_version_draft_29, disable); } else if (version == ParsedQuicVersion::Draft27()) { SetQuicReloadableFlag(quic_disable_version_draft_27, disable); } else if (version == ParsedQuicVersion::Draft25()) { @@ -59,7 +59,7 @@ } else if (version == ParsedQuicVersion::Q043()) { SetQuicReloadableFlag(quic_disable_version_q043, disable); } else { - QUIC_BUG << "Cannot " << (should_enable ? "en" : "dis") << "able version " + QUIC_BUG << "Cannot " << (enable ? "en" : "dis") << "able version " << version; } } @@ -440,7 +440,7 @@ for (const ParsedQuicVersion& version : versions) { if (version.transport_version == QUIC_VERSION_IETF_DRAFT_29) { QUIC_BUG_IF(version.handshake_protocol != PROTOCOL_TLS1_3); - if (GetQuicReloadableFlag(quic_enable_version_draft_29)) { + if (!GetQuicReloadableFlag(quic_disable_version_draft_29)) { filtered_versions.push_back(version); } } else if (version.transport_version == QUIC_VERSION_IETF_DRAFT_27) {