gfe-relnote: Deprecate gfe2_reloadable_flag_quic_enable_ietf_loss_detection.
PiperOrigin-RevId: 289430458
Change-Id: I16ff18596ddbcf6485be30b501105bb36f95aa35
diff --git a/quic/core/quic_sent_packet_manager.cc b/quic/core/quic_sent_packet_manager.cc
index bcd7590..72ca436 100644
--- a/quic/core/quic_sent_packet_manager.cc
+++ b/quic/core/quic_sent_packet_manager.cc
@@ -266,44 +266,37 @@
uber_loss_algorithm_.SetLossDetectionType(kLazyFack);
}
}
- if (GetQuicReloadableFlag(quic_enable_ietf_loss_detection)) {
- if (config.HasClientRequestedIndependentOption(kILD0, perspective)) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_enable_ietf_loss_detection, 1, 5);
- uber_loss_algorithm_.SetLossDetectionType(kIetfLossDetection);
- if (GetQuicRestartFlag(quic_default_on_ietf_loss_detection)) {
- uber_loss_algorithm_.SetReorderingShift(kDefaultIetfLossDelayShift);
- uber_loss_algorithm_.DisableAdaptiveReorderingThreshold();
- }
+ if (config.HasClientRequestedIndependentOption(kILD0, perspective)) {
+ uber_loss_algorithm_.SetLossDetectionType(kIetfLossDetection);
+ if (GetQuicRestartFlag(quic_default_on_ietf_loss_detection)) {
+ uber_loss_algorithm_.SetReorderingShift(kDefaultIetfLossDelayShift);
+ uber_loss_algorithm_.DisableAdaptiveReorderingThreshold();
}
- if (config.HasClientRequestedIndependentOption(kILD1, perspective)) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_enable_ietf_loss_detection, 2, 5);
- uber_loss_algorithm_.SetLossDetectionType(kIetfLossDetection);
- uber_loss_algorithm_.SetReorderingShift(kDefaultLossDelayShift);
- if (GetQuicRestartFlag(quic_default_on_ietf_loss_detection)) {
- uber_loss_algorithm_.DisableAdaptiveReorderingThreshold();
- }
+ }
+ if (config.HasClientRequestedIndependentOption(kILD1, perspective)) {
+ uber_loss_algorithm_.SetLossDetectionType(kIetfLossDetection);
+ uber_loss_algorithm_.SetReorderingShift(kDefaultLossDelayShift);
+ if (GetQuicRestartFlag(quic_default_on_ietf_loss_detection)) {
+ uber_loss_algorithm_.DisableAdaptiveReorderingThreshold();
}
- if (config.HasClientRequestedIndependentOption(kILD2, perspective)) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_enable_ietf_loss_detection, 3, 5);
- uber_loss_algorithm_.SetLossDetectionType(kIetfLossDetection);
- uber_loss_algorithm_.EnableAdaptiveReorderingThreshold();
- if (GetQuicRestartFlag(quic_default_on_ietf_loss_detection)) {
- uber_loss_algorithm_.SetReorderingShift(kDefaultIetfLossDelayShift);
- }
+ }
+ if (config.HasClientRequestedIndependentOption(kILD2, perspective)) {
+ uber_loss_algorithm_.SetLossDetectionType(kIetfLossDetection);
+ uber_loss_algorithm_.EnableAdaptiveReorderingThreshold();
+ if (GetQuicRestartFlag(quic_default_on_ietf_loss_detection)) {
+ uber_loss_algorithm_.SetReorderingShift(kDefaultIetfLossDelayShift);
}
- if (config.HasClientRequestedIndependentOption(kILD3, perspective)) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_enable_ietf_loss_detection, 4, 5);
- uber_loss_algorithm_.SetLossDetectionType(kIetfLossDetection);
- uber_loss_algorithm_.SetReorderingShift(kDefaultLossDelayShift);
- uber_loss_algorithm_.EnableAdaptiveReorderingThreshold();
- }
- if (config.HasClientRequestedIndependentOption(kILD4, perspective)) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_enable_ietf_loss_detection, 5, 5);
- uber_loss_algorithm_.SetLossDetectionType(kIetfLossDetection);
- uber_loss_algorithm_.SetReorderingShift(kDefaultLossDelayShift);
- uber_loss_algorithm_.EnableAdaptiveReorderingThreshold();
- uber_loss_algorithm_.EnableAdaptiveTimeThreshold();
- }
+ }
+ if (config.HasClientRequestedIndependentOption(kILD3, perspective)) {
+ uber_loss_algorithm_.SetLossDetectionType(kIetfLossDetection);
+ uber_loss_algorithm_.SetReorderingShift(kDefaultLossDelayShift);
+ uber_loss_algorithm_.EnableAdaptiveReorderingThreshold();
+ }
+ if (config.HasClientRequestedIndependentOption(kILD4, perspective)) {
+ uber_loss_algorithm_.SetLossDetectionType(kIetfLossDetection);
+ uber_loss_algorithm_.SetReorderingShift(kDefaultLossDelayShift);
+ uber_loss_algorithm_.EnableAdaptiveReorderingThreshold();
+ uber_loss_algorithm_.EnableAdaptiveTimeThreshold();
}
if (config.HasClientSentConnectionOption(kCONH, perspective)) {
conservative_handshake_retransmits_ = true;
diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc
index 86ee40a..a36d86a 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -1799,7 +1799,6 @@
}
TEST_F(QuicSentPacketManagerTest, NegotiateIetfLossDetectionFromOptions) {
- SetQuicReloadableFlag(quic_enable_ietf_loss_detection, true);
if (GetQuicRestartFlag(quic_default_on_ietf_loss_detection)) {
EXPECT_EQ(kIetfLossDetection,
QuicSentPacketManagerPeer::GetLossAlgorithm(&manager_)
@@ -1833,7 +1832,6 @@
TEST_F(QuicSentPacketManagerTest,
NegotiateIetfLossDetectionOneFourthRttFromOptions) {
- SetQuicReloadableFlag(quic_enable_ietf_loss_detection, true);
if (GetQuicRestartFlag(quic_default_on_ietf_loss_detection)) {
EXPECT_EQ(kIetfLossDetection,
QuicSentPacketManagerPeer::GetLossAlgorithm(&manager_)
@@ -1868,7 +1866,6 @@
TEST_F(QuicSentPacketManagerTest,
NegotiateIetfLossDetectionAdaptiveReorderingThreshold) {
- SetQuicReloadableFlag(quic_enable_ietf_loss_detection, true);
if (GetQuicRestartFlag(quic_default_on_ietf_loss_detection)) {
EXPECT_EQ(kIetfLossDetection,
QuicSentPacketManagerPeer::GetLossAlgorithm(&manager_)
@@ -1904,7 +1901,6 @@
TEST_F(QuicSentPacketManagerTest,
NegotiateIetfLossDetectionAdaptiveReorderingThreshold2) {
- SetQuicReloadableFlag(quic_enable_ietf_loss_detection, true);
if (GetQuicRestartFlag(quic_default_on_ietf_loss_detection)) {
EXPECT_EQ(kIetfLossDetection,
QuicSentPacketManagerPeer::GetLossAlgorithm(&manager_)
@@ -1940,7 +1936,6 @@
TEST_F(QuicSentPacketManagerTest,
NegotiateIetfLossDetectionAdaptiveReorderingAndTimeThreshold) {
- SetQuicReloadableFlag(quic_enable_ietf_loss_detection, true);
if (GetQuicRestartFlag(quic_default_on_ietf_loss_detection)) {
EXPECT_EQ(kIetfLossDetection,
QuicSentPacketManagerPeer::GetLossAlgorithm(&manager_)
