Cherry pick commit r9661548

REVIEW: 2694733
x-ydb-stable-ref: 615f957f32385df3fb746f7b86fa2f9dcb781605

2 files changed, 156 insertions, 2 deletions

diff --git a/ydb/core/blobstorage/ut_blobstorage/block_race.cpp b/ydb/core/blobstorage/ut_blobstorage/block_race.cpp
index daa06c9087..7d32a8bdf3 100644
--- a/ydb/core/blobstorage/ut_blobstorage/block_race.cpp
+++ b/ydb/core/blobstorage/ut_blobstorage/block_race.cpp
@@ -1,5 +1,4 @@
 #include <ydb/core/blobstorage/ut_blobstorage/lib/env.h>
-#include <ydb/core/blobstorage/vdisk/common/vdisk_private_events.h>
 
 Y_UNIT_TEST_SUITE(BlobStorageBlockRace) {
     Y_UNIT_TEST(Test) {
@@ -46,4 +45,159 @@ Y_UNIT_TEST_SUITE(BlobStorageBlockRace) {
             UNIT_ASSERT_VALUES_EQUAL(sendBlock(orderNum, 2, 2), NKikimrProto::ALREADY);
         }
     }
+
+    Y_UNIT_TEST(BlocksRacingViaSyncLog) {
+        TEnvironmentSetup env{{
+            .NodeCount = 8,
+            .Erasure = TBlobStorageGroupType::Erasure4Plus2Block,
+        }};
+
+        ui32 numVDiskSyncEvents = 0;
+        env.Runtime->FilterFunction = [&](ui32 /*nodeId*/, std::unique_ptr<IEventHandle>& ev) {
+            switch (ev->GetTypeRewrite()) {
+                case TEvBlobStorage::EvVSyncResult:
+                case TEvBlobStorage::EvVSyncFullResult:
+                    ++numVDiskSyncEvents;
+                    break;
+            }
+            return true;
+        };
+
+        env.CreateBoxAndPool(1, 1);
+        auto groups = env.GetGroups();
+        UNIT_ASSERT_VALUES_EQUAL(groups.size(), 1);
+        const TIntrusivePtr<TBlobStorageGroupInfo> info = env.GetGroupInfo(groups.front());
+        env.Sim(TDuration::Seconds(30));
+
+        const TActorId edge = env.Runtime->AllocateEdgeActor(env.Settings.ControllerNodeId, __FILE__, __LINE__);
+        const ui64 tabletId = 1;
+        const ui32 generation = 1;
+        const ui64 guid1 = 1;
+        const ui64 guid2 = 2;
+        ui32 responsesPending = 0;
+
+        std::vector<TActorId> queues;
+        for (ui32 i = 0; i < info->GetTotalVDisksNum(); ++i) {
+            queues.push_back(env.CreateQueueActor(info->GetVDiskId(i), NKikimrBlobStorage::EVDiskQueueId::PutTabletLog,
+                1000));
+        }
+
+        auto issue = [&](ui32 begin, ui32 end, ui64 guid) {
+            for (ui32 i = begin; i < end; ++i) {
+                env.Runtime->Send(new IEventHandle(queues[i], edge, new TEvBlobStorage::TEvVBlock(tabletId, generation,
+                    info->GetVDiskId(i), TInstant::Max(), guid)), edge.NodeId());
+                ++responsesPending;
+            }
+        };
+
+        auto checkStatus = [&](NKikimrProto::EReplyStatus expected) {
+            for (; responsesPending; --responsesPending) {
+                auto ev = env.WaitForEdgeActorEvent<TEvBlobStorage::TEvVBlockResult>(edge, false);
+                const auto& record = ev->Get()->Record;
+                UNIT_ASSERT_VALUES_EQUAL(record.GetStatus(), expected);
+            }
+        };
+
+        numVDiskSyncEvents = 0;
+        issue(0, info->Type.Handoff(), guid1);
+        issue(info->Type.Handoff(), info->GetTotalVDisksNum(), guid2);
+        checkStatus(NKikimrProto::OK);
+        issue(info->Type.Handoff(), info->GetTotalVDisksNum(), guid1);
+        checkStatus(NKikimrProto::ALREADY);
+        UNIT_ASSERT_VALUES_EQUAL(numVDiskSyncEvents, 0);
+
+        // wait for sync to complete
+        env.Sim(TDuration::Seconds(10));
+        UNIT_ASSERT(numVDiskSyncEvents);
+
+        issue(info->Type.Handoff(), info->GetTotalVDisksNum(), guid1);
+        checkStatus(NKikimrProto::ALREADY);
+        issue(0, info->Type.Handoff(), guid1);
+        checkStatus(NKikimrProto::OK);
+
+        issue(info->Type.Handoff(), info->GetTotalVDisksNum(), guid2);
+        checkStatus(NKikimrProto::OK);
+        issue(0, info->Type.Handoff(), guid2);
+        checkStatus(NKikimrProto::ALREADY);
+    }
+
+    Y_UNIT_TEST(BlocksRacingViaSyncLog2) {
+        TEnvironmentSetup env{{
+            .NodeCount = 8,
+            .Erasure = TBlobStorageGroupType::Erasure4Plus2Block,
+        }};
+
+        ui32 numVDiskSyncEvents = 0;
+        std::deque<std::pair<ui32, std::unique_ptr<IEventHandle>>> postponedEventQ;
+        bool postponeNodes1to6 = false;
+        env.Runtime->FilterFunction = [&](ui32 nodeId, std::unique_ptr<IEventHandle>& ev) {
+            switch (ev->GetTypeRewrite()) {
+                case TEvBlobStorage::EvVSyncResult:
+                case TEvBlobStorage::EvVSyncFullResult:
+                    ++numVDiskSyncEvents;
+                    break;
+            }
+            if (postponeNodes1to6 && ev->GetTypeRewrite() == TEvBlobStorage::EvLog && nodeId >= 1 && nodeId <= 6) {
+                postponedEventQ.emplace_back(nodeId, std::exchange(ev, nullptr));
+                return false;
+            }
+            return true;
+        };
+        auto sendPostponed = [&] {
+            for (auto& [nodeId, ev] : std::exchange(postponedEventQ, {})) {
+                env.Runtime->Send(ev.release(), nodeId);
+            }
+        };
+
+        env.CreateBoxAndPool(1, 1);
+        auto groups = env.GetGroups();
+        UNIT_ASSERT_VALUES_EQUAL(groups.size(), 1);
+        const TIntrusivePtr<TBlobStorageGroupInfo> info = env.GetGroupInfo(groups.front());
+        env.Sim(TDuration::Seconds(30));
+
+        const TActorId edge = env.Runtime->AllocateEdgeActor(env.Settings.ControllerNodeId, __FILE__, __LINE__);
+        const ui64 tabletId = 1;
+        const ui32 generation = 1;
+        const ui64 guid1 = 1;
+        const ui64 guid2 = 2;
+
+        std::vector<TActorId> queues;
+        for (ui32 i = 0; i < info->GetTotalVDisksNum(); ++i) {
+            queues.push_back(env.CreateQueueActor(info->GetVDiskId(i), NKikimrBlobStorage::EVDiskQueueId::PutTabletLog,
+                1000));
+            UNIT_ASSERT_VALUES_EQUAL(info->GetActorId(i).NodeId(), i + 1);
+        }
+
+        auto issue = [&](ui32 begin, ui32 end, ui64 guid) {
+            for (ui32 i = begin; i < end; ++i) {
+                env.Runtime->Send(new IEventHandle(queues[i], edge, new TEvBlobStorage::TEvVBlock(tabletId, generation,
+                    info->GetVDiskId(i), TInstant::Max(), guid)), edge.NodeId());
+            }
+        };
+
+        auto checkStatus = [&](ui32 num, NKikimrProto::EReplyStatus expected) {
+            for (; num; --num) {
+                auto ev = env.WaitForEdgeActorEvent<TEvBlobStorage::TEvVBlockResult>(edge, false);
+                const auto& record = ev->Get()->Record;
+                UNIT_ASSERT_VALUES_EQUAL(record.GetStatus(), expected);
+            }
+        };
+
+        numVDiskSyncEvents = 0;
+        postponeNodes1to6 = true;
+        issue(0, 6, guid1);
+        issue(6, 8, guid2);
+        checkStatus(2, NKikimrProto::OK);
+        UNIT_ASSERT_VALUES_EQUAL(numVDiskSyncEvents, 0);
+        env.Sim(TDuration::Seconds(10));
+        UNIT_ASSERT(numVDiskSyncEvents);
+        postponeNodes1to6 = false;
+        sendPostponed();
+        checkStatus(6, NKikimrProto::OK);
+        env.Sim(TDuration::Seconds(10));
+        issue(0, 6, guid2);
+        checkStatus(6, NKikimrProto::ALREADY);
+        issue(0, 6, guid1);
+        checkStatus(6, NKikimrProto::OK);
+    }
 }
diff --git a/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block.cpp b/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block.cpp
index 7f639cef5b..0518901777 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block.cpp
+++ b/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block.cpp
@@ -113,7 +113,7 @@ namespace NKikimr {
     void TBlocksCache::UpdatePersistent(ui64 tabletId, TBlockedGen gen) {
         Y_VERIFY(Initialized);
         auto& value = PersistentBlocks[tabletId];
-        if (value.Generation <= gen.Generation) {
+        if (value.Generation < gen.Generation) {
             value = gen;
         }
     }