YT-23469: Ensure proper destructor order inside |RunInFiberContext| even when exception is thrown

commit_hash:5dde84deb176c7a4be831d9870deab45f66d1237

1 files changed, 6 insertions, 2 deletions

diff --git a/yt/yt/core/concurrency/fiber_scheduler_thread.cpp b/yt/yt/core/concurrency/fiber_scheduler_thread.cpp
index 4c1509d8ca..441d093a4c 100644
--- a/yt/yt/core/concurrency/fiber_scheduler_thread.cpp
+++ b/yt/yt/core/concurrency/fiber_scheduler_thread.cpp
@@ -983,9 +983,13 @@ Y_NO_INLINE void RunInFiberContext(TFiber* fiber, TClosure callback)
 {
     TFiberSwitchHandler switchHandler(fiber);
     TNullPropagatingStorageGuard nullPropagatingStorageGuard;
+
+    auto cleanup = Finally([&callback] {
+        // To ensure callback is destroyed before switchHandler.
+        callback.Reset();
+    });
+
     callback();
-    // To ensure callback is destroyed before switchHandler.
-    callback.Reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////