Fix assimilation barrier issue

2 files changed, 7 insertions, 9 deletions

diff --git a/ydb/core/blobstorage/ut_blobstorage/assimilation.cpp b/ydb/core/blobstorage/ut_blobstorage/assimilation.cpp
index c2514d3d665..2c4ef621a9e 100644
--- a/ydb/core/blobstorage/ut_blobstorage/assimilation.cpp
+++ b/ydb/core/blobstorage/ut_blobstorage/assimilation.cpp
@@ -4,7 +4,7 @@ Y_UNIT_TEST_SUITE(VDiskAssimilation) {
     Y_UNIT_TEST(Test) {
         TEnvironmentSetup env{{
             .NodeCount = 8,
-            .Erasure = TBlobStorageGroupType::Erasure4Plus2Block,
+            .Erasure = TBlobStorageGroupType::ErasureNone,
         }};
         auto& runtime = env.Runtime;
 
diff --git a/ydb/core/blobstorage/vdisk/query/assimilation.cpp b/ydb/core/blobstorage/vdisk/query/assimilation.cpp
index 07ef96c24d3..376cf139e83 100644
--- a/ydb/core/blobstorage/vdisk/query/assimilation.cpp
+++ b/ydb/core/blobstorage/vdisk/query/assimilation.cpp
@@ -133,15 +133,13 @@ namespace NKikimr {
                 const TMemRecBarrier& memRec = iter;
                 if (next.TabletId != key.TabletId || next.Channel != key.Channel) {
                     break;
+                } else if (memRec.Ingress.IsQuorum(Snap.HullCtx->IngressCache.Get())) {
+                    auto *value = next.Hard ? pb->MutableHard() : pb->MutableSoft();
+                    value->SetRecordGeneration(next.Gen);
+                    value->SetPerGenerationCounter(next.GenCounter);
+                    value->SetCollectGeneration(memRec.CollectGen);
+                    value->SetCollectStep(memRec.CollectStep);
                 }
-
-                auto *value = next.Hard ? pb->MutableHard() : pb->MutableSoft();
-                value->SetRecordGeneration(next.Gen);
-                value->SetPerGenerationCounter(next.GenCounter);
-                // TODO(alexvru): should we obtain quorum here? it looks not, because as the GC command was issued, then
-                // all the keep flags already have been set, so we can choose the latest issued barrier for the tablet
-                value->SetCollectGeneration(memRec.CollectGen);
-                value->SetCollectStep(memRec.CollectStep);
             }
 
             using T = NKikimrBlobStorage::TEvVAssimilateResult::TBarrier;