From 35816cc9a150ad6a350bc18e8fe759f501fa3f73 Mon Sep 17 00:00:00 2001 From: Magnus Jedvert Date: Fri, 15 Mar 2019 11:58:45 +0000 Subject: [PATCH] Revert "Log an error if the RTT is negative" This reverts commit a594ef089370b8073ca9dc5a6b6bf4be9a58a313. Reason for revert: This log is triggered more than 10,000 times per run, spamming the log output to the extent that tests start failing with EXCESSIVE_OUTPUT. The tests are chromium.webrtc.fyi tests: * WebRtcStressResolutionSwitchBrowserTest.MANUAL_SurvivesPeerConnectionResolutionSwitching * WebRtcStressPauseBrowserTest.MANUAL_SurvivesPeerConnectionVideoPausePlaying on linux, win, and mac. Example run: https://ci.chromium.org/p/chromium/builders/webrtc.fyi/WebRTC%20Chromium%20FYI%20Linux%20Tester/2556 Original change's description: > Log an error if the RTT is negative > > Bug: webrtc:10407 > Change-Id: I5479cb2b7163c6e9e58854f4ffa7976b3d606da5 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127568 > Commit-Queue: Evan Shrubsole > Reviewed-by: Sebastian Jansson > Cr-Commit-Position: refs/heads/master@{#27122} TBR=srte@webrtc.org,eshr@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:10407 Change-Id: Ida2572b722b92bae4893d4567597dd21d1df54b4 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128120 Reviewed-by: Magnus Jedvert Commit-Queue: Magnus Jedvert Cr-Commit-Position: refs/heads/master@{#27144} --- .../congestion_controller/goog_cc/goog_cc_network_control.cc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc index 3d98101398..283ca983e9 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -381,11 +381,6 @@ NetworkControlUpdate GoogCcNetworkController::OnTransportPacketsFeedback( for (const auto& feedback : feedbacks) { TimeDelta feedback_rtt = report.feedback_time - feedback.sent_packet.send_time; - // TODO(bugs.webrtc.org/10407): This should be a DCHECK and never happen - if (feedback_rtt < TimeDelta::Zero()) - RTC_LOG(LS_ERROR) << "negative rtt detected send_time_ms=" - << feedback.sent_packet.send_time.ms() - << " feedback_time_ms=" << report.feedback_time.ms(); TimeDelta min_pending_time = feedback.receive_time - max_recv_time; TimeDelta propagation_rtt = feedback_rtt - min_pending_time; max_feedback_rtt = std::max(max_feedback_rtt, feedback_rtt);