Increment failed request in rpc bus channel in case of channel termination or failed ack

commit_hash:dba982cf1f4acdf39e4e4cb837b0d62978eb9904

1 files changed, 8 insertions, 5 deletions

diff --git a/yt/yt/core/rpc/bus/channel.cpp b/yt/yt/core/rpc/bus/channel.cpp
index d90dc774d9..af49c94eb1 100644
--- a/yt/yt/core/rpc/bus/channel.cpp
+++ b/yt/yt/core/rpc/bus/channel.cpp
@@ -343,8 +343,10 @@ private:
             }
 
             for (const auto& existingRequest : existingRequests) {
+                const auto& requestControl = std::get<0>(existingRequest);
+                requestControl->ProfileError(error);
                 NotifyError(
-                    std::get<0>(existingRequest),
+                    requestControl,
                     std::get<1>(existingRequest),
                     TStringBuf("Request failed due to channel termination"),
                     error);
@@ -1087,18 +1089,19 @@ private:
 
                 requestControl = it->second;
                 requestControl->ResetAcknowledgementTimeoutCookie();
-                if (!error.IsOK()) {
-                    responseHandler = requestControl->Finalize(guard);
-                    bucket->ActiveRequestMap.erase(it);
-                } else {
+                if (error.IsOK()) {
                     requestControl->ProfileAcknowledgement();
                     responseHandler = requestControl->GetResponseHandler(guard);
+                } else {
+                    responseHandler = requestControl->Finalize(guard);
+                    bucket->ActiveRequestMap.erase(it);
                 }
             }
 
             if (error.IsOK()) {
                 NotifyAcknowledgement(requestId, responseHandler);
             } else {
+                requestControl->ProfileError(error);
                 NotifyError(
                     requestControl,
                     responseHandler,