Refactor requests-in-progress tracking (#4752)

<img width="1217" height="407" alt="image"
src="https://github.com/user-attachments/assets/ca8c48bf-d90d-40a5-b2d8-b9f5d5f064ce"
/>

Author: drbasic

cloud/blockstore/libs/storage/model/request_bounds_tracker.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "requests_in_progress.h"
-
 #include <cloud/blockstore/libs/common/block_range.h>
 
 #include <util/generic/hash.h>
@@ -31,110 +29,4 @@ class TRequestBoundsTracker
     [[nodiscard]] bool OverlapsWithRequest(TBlockRange64 r) const;
 };
 
-template <typename TValue>
-struct TRequestInProgressWithBlockRange
-{
-    TValue Value;
-    bool IsWrite = false;
-    TBlockRange64 BlockRange;
-};
-
-template <EAllowedRequests TKind, typename TKey, typename TValue = TEmptyType>
-class TRequestsInProgressWithBlockRangeTracking
-    : public IRequestsInProgress
-    , TRequestsInProgressImpl<TKey, TRequestInProgressWithBlockRange<TValue>>
-{
-    using TImpl =
-        TRequestsInProgressImpl<TKey, TRequestInProgressWithBlockRange<TValue>>;
-
-private:
-    TRequestBoundsTracker WriteRequestBoundsTracker;
-
-public:
-    using TRequest = TRequestInProgressWithBlockRange<TValue>;
-
-public:
-    explicit TRequestsInProgressWithBlockRangeTracking(size_t blockSize)
-        : WriteRequestBoundsTracker(blockSize)
-    {}
-
-    using TImpl::AllRequests;
-    using TImpl::Empty;
-    using TImpl::GenerateRequestId;
-    using TImpl::GetRequest;
-    using TImpl::GetRequestCount;
-    using TImpl::SetRequestIdentityKey;
-
-    void AddReadRequest(const TKey& key, TBlockRange64 range, TValue value = {})
-        requires(IsReadAllowed<TKind>)
-    {
-        TImpl::AddRequest(
-            key,
-            {.Value = std::move(value), .IsWrite = false, .BlockRange = range});
-    }
-
-    TKey AddReadRequest(TBlockRange64 range, TValue value = {})
-        requires(IsReadAllowed<TKind>)
-    {
-        return TImpl::AddRequest(
-            {.Value = std::move(value), .IsWrite = false, .BlockRange = range});
-    }
-
-    void
-    AddWriteRequest(const TKey& key, TBlockRange64 range, TValue value = {})
-        requires(IsWriteAllowed<TKind>)
-    {
-        WriteRequestBoundsTracker.AddRequest(range);
-
-        TImpl::AddRequest(
-            key,
-            {.Value = std::move(value), .IsWrite = true, .BlockRange = range});
-    }
-
-    TKey AddWriteRequest(TBlockRange64 range, TValue value = {})
-        requires(IsWriteAllowed<TKind>)
-    {
-        TKey key = GenerateRequestId();
-        AddWriteRequest(key, range, std::move(value));
-        return key;
-    }
-
-    bool RemoveRequest(const TKey& key)
-    {
-        return ExtractRequest(key).has_value();
-    }
-
-    std::optional<TRequest> ExtractRequest(const TKey& key)
-    {
-        auto request = TImpl::ExtractRequest(key);
-        if (request && request->IsWrite) {
-            WriteRequestBoundsTracker.RemoveRequest(request->BlockRange);
-        }
-
-        return request;
-    }
-
-    const TRequestBoundsTracker& GetRequestBoundsTracker()
-    {
-        return WriteRequestBoundsTracker;
-    }
-
-    // IRequestsInProgress
-
-    [[nodiscard]] bool WriteRequestInProgress() const override
-    {
-        return TImpl::WriteRequestInProgress();
-    }
-
-    void WaitForInFlightWrites() override
-    {
-        TImpl::WaitForInFlightWrites();
-    }
-
-    [[nodiscard]] bool IsWaitingForInFlightWrites() const override
-    {
-        return TImpl::IsWaitingForInFlightWrites();
-    }
-};
-
 }   // namespace NCloud::NBlockStore::NStorage

cloud/blockstore/libs/storage/model/request_bounds_tracker_ut.cpp

@@ -1,6 +1,7 @@
 #include "request_bounds_tracker.h"
 
 #include "common_constants.h"
+#include "requests_in_progress.h"
 
 #include <library/cpp/testing/unittest/registar.h>
 
@@ -106,32 +107,31 @@ Y_UNIT_TEST_SUITE(TRequestBoundsTrackerTest)
             ui32>
             requestsInProgress{blockSize};
 
-        const auto& boundsTracker =
-            requestsInProgress.GetRequestBoundsTracker();
-
         auto blocksPerTrackingRange = MigrationRangeSize / 4_KB;
 
         {
             auto id1 = requestsInProgress.GenerateRequestId();
 
             requestsInProgress.AddWriteRequest(
                 id1,
-                TBlockRange64::WithLength(0, 10));
+                TBlockRange64::WithLength(0, 10),
+                {});
 
-            UNIT_ASSERT(boundsTracker.OverlapsWithRequest(
+            UNIT_ASSERT(requestsInProgress.Overlaps(
                 TBlockRange64::WithLength(0, blocksPerTrackingRange)));
 
             auto id2 = requestsInProgress.GenerateRequestId();
             requestsInProgress.AddWriteRequest(
                 id2,
-                TBlockRange64::WithLength(10, 10));
+                TBlockRange64::WithLength(10, 10),
+                {});
             requestsInProgress.ExtractRequest(id1);
 
-            UNIT_ASSERT(boundsTracker.OverlapsWithRequest(
+            UNIT_ASSERT(requestsInProgress.Overlaps(
                 TBlockRange64::WithLength(0, blocksPerTrackingRange)));
 
             requestsInProgress.ExtractRequest(id2);
-            UNIT_ASSERT(!boundsTracker.OverlapsWithRequest(
+            UNIT_ASSERT(!requestsInProgress.Overlaps(
                 TBlockRange64::WithLength(0, blocksPerTrackingRange)));
         }
 
@@ -141,12 +141,13 @@ Y_UNIT_TEST_SUITE(TRequestBoundsTrackerTest)
 
             requestsInProgress.AddWriteRequest(
                 id1,
-                TBlockRange64::WithLength(blocksPerTrackingRange - 1, 2));
+                TBlockRange64::WithLength(blocksPerTrackingRange - 1, 2),
+                {});
 
-            UNIT_ASSERT(boundsTracker.OverlapsWithRequest(
+            UNIT_ASSERT(requestsInProgress.Overlaps(
                 TBlockRange64::WithLength(0, blocksPerTrackingRange)));
             UNIT_ASSERT(
-                boundsTracker.OverlapsWithRequest(TBlockRange64::WithLength(
+                requestsInProgress.Overlaps(TBlockRange64::WithLength(
                     blocksPerTrackingRange,
                     2 * blocksPerTrackingRange)));
         }
@@ -161,32 +162,31 @@ Y_UNIT_TEST_SUITE(TRequestBoundsTrackerTest)
             ui32>
             requestsInProgress{blockSize};
 
-        const auto& boundsTracker =
-            requestsInProgress.GetRequestBoundsTracker();
-
         auto blocksPerTrackingRange = MigrationRangeSize / 4_KB;
 
         auto id1 = requestsInProgress.GenerateRequestId();
         requestsInProgress.AddWriteRequest(
             id1,
-            TBlockRange64::WithLength(0, blocksPerTrackingRange));
+            TBlockRange64::WithLength(0, blocksPerTrackingRange),
+            {});
 
-        UNIT_ASSERT(boundsTracker.OverlapsWithRequest(
+        UNIT_ASSERT(requestsInProgress.Overlaps(
             TBlockRange64::WithLength(0, blocksPerTrackingRange)));
 
         requestsInProgress.RemoveRequest(id1);
 
-        UNIT_ASSERT(!boundsTracker.OverlapsWithRequest(
+        UNIT_ASSERT(!requestsInProgress.Overlaps(
             TBlockRange64::WithLength(0, blocksPerTrackingRange)));
 
         auto id2 = requestsInProgress.AddWriteRequest(
-            TBlockRange64::WithLength(0, blocksPerTrackingRange));
-        UNIT_ASSERT(boundsTracker.OverlapsWithRequest(
+            TBlockRange64::WithLength(0, blocksPerTrackingRange),
+            {});
+        UNIT_ASSERT(requestsInProgress.Overlaps(
             TBlockRange64::WithLength(0, blocksPerTrackingRange)));
 
         requestsInProgress.RemoveRequest(id2);
 
-        UNIT_ASSERT(!boundsTracker.OverlapsWithRequest(
+        UNIT_ASSERT(!requestsInProgress.Overlaps(
             TBlockRange64::WithLength(0, blocksPerTrackingRange)));
     }
 }