From a162682d6d63a435da4e283c28c3762e40f184ad Mon Sep 17 00:00:00 2001 From: "A.J. Beamon" Date: Fri, 14 May 2021 11:12:47 -0700 Subject: [PATCH 1/2] Fix accounting for time spent in run loop after breaking due to yield --- flow/Net2.actor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/flow/Net2.actor.cpp b/flow/Net2.actor.cpp index bb0b0325c6..c3b35f1203 100644 --- a/flow/Net2.actor.cpp +++ b/flow/Net2.actor.cpp @@ -1513,6 +1513,7 @@ void Net2::run() { double newTaskBegin = timer_monotonic(); if (check_yield(TaskPriority::Max, tscNow)) { checkForSlowTask(tscBegin, tscNow, newTaskBegin - taskBegin, currentTaskID); + taskBegin = newTaskBegin; FDB_TRACE_PROBE(run_loop_yield); ++countYields; break; From d55b94fc06ca521bfc8b35d91a9f0f0ad226f5a8 Mon Sep 17 00:00:00 2001 From: "A.J. Beamon" Date: Fri, 14 May 2021 12:38:26 -0700 Subject: [PATCH 2/2] Add release note --- documentation/sphinx/source/release-notes/release-notes-630.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/documentation/sphinx/source/release-notes/release-notes-630.rst b/documentation/sphinx/source/release-notes/release-notes-630.rst index f4b5c8aacb..2057e7fcb2 100644 --- a/documentation/sphinx/source/release-notes/release-notes-630.rst +++ b/documentation/sphinx/source/release-notes/release-notes-630.rst @@ -2,9 +2,11 @@ Release Notes ############# + 6.3.13 ====== * The multi-version client now requires at most two client connections with version 6.2 or larger, regardless of how many external clients are configured. Clients older than 6.2 will continue to create an additional connection each. `(PR #4667) `_ +* Fix an accounting error that could potentially result in inaccuracies in priority busyness metrics. `(PR #4824) `_ 6.3.12 ======