YT-20015: Fix leaking request processing callbacks in TRequestQueue::ScheduleRequestsFromQueue.

1 files changed, 7 insertions, 3 deletions

diff --git a/yt/yt/core/rpc/service_detail.cpp b/yt/yt/core/rpc/service_detail.cpp
index 54b62e43f91..a7420b8f31a 100644
--- a/yt/yt/core/rpc/service_detail.cpp
+++ b/yt/yt/core/rpc/service_detail.cpp
@@ -1299,12 +1299,16 @@ void TRequestQueue::ScheduleRequestsFromQueue()
     while (QueueSize_.load() > 0 && Concurrency_.load() < concurrencyLimit) {
         if (AreThrottlersOverdrafted()) {
             SubscribeToThrottlers();
-            break;
+            return;
         }
 
         TServiceBase::TServiceContextPtr context;
-        if (!Queue_.try_dequeue(context)) {
-            break;
+        while (!Queue_.try_dequeue(context)) {
+            // False negatives are possible in Moody Camel.
+            if (QueueSize_.load() > 0) {
+                continue;
+            }
+            return;
         }
 
         DecrementQueueSize();