stable-25-2: Fix get with blocked generation in better way (#29299)

Author: ydbot

ydb/core/blob_depot/agent/storage_get.cpp

@@ -32,10 +32,12 @@ namespace NKikimr::NBlobDepot {
                     if (CheckBlockForTablet(blk->Id, std::nullopt, &blockedGeneration) != NKikimrProto::OK) {
                         return;
                     }
-                    if (blockedGeneration != blk->Generation) {
+                    if (blockedGeneration < blk->Generation) {
                         // this can happen only in distributed storage, but not possible in BlobDepot
-                        return EndWithError(NKikimrProto::ERROR, "incorrect blocked generation provided for"
-                            " ForceBlockTabletData in TEvGet query to BlobDepot");
+                        return EndWithError(NKikimrProto::ERROR, TStringBuilder() << "incorrect blocked generation"
+                            " provided for ForceBlockTabletData in TEvGet query to BlobDepot"
+                            << " Id# " << blk->Id << " required Generation# " << blk->Generation
+                            << " actual Generation# " << blockedGeneration);
                     }
                 }
 

ydb/core/blobstorage/dsproxy/mock/model.h

@@ -114,7 +114,7 @@ namespace NFake {
             }
             if (const auto& blk = msg->ForceBlockTabletData; blk && blk->Generation) {
                 auto it = Blocks.find(blk->Id);
-                Y_VERIFY_S(it != Blocks.end() && it->second == blk->Generation, "incorrect ForceBlockTabletData"
+                Y_VERIFY_S(it != Blocks.end() && blk->Generation <= it->second, "incorrect ForceBlockTabletData"
                     << " expected Generation# " << blk->Generation
                     << " having Generation# " << (it != Blocks.end() ? ToString(it->second) : "none"));
             }

ydb/core/tablet/tablet_req_rebuildhistory.cpp

@@ -496,6 +496,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil
             return BuildHistory();
 
         for (auto &xpair : RefsToCheckByGroup) {
+            std::ranges::sort(xpair.second);
             if (!SendRefsCheck(xpair.second, xpair.first)) {
                 BLOG_ERROR("TTabletReqRebuildHistoryGraph::MakeHistory SendRefsCheck A error", "TRRH06");
                 if (IntrospectionTrace) {
@@ -519,6 +520,11 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil
             ui64 endRequestIdx = endIdx;
             ui64 totalSize = 0;
             for (ui64 i = firstRequestIdx; i != endIdx; ++i) {
+                if (refs[i].Generation() != refs[firstRequestIdx].Generation()) {
+                    endRequestIdx = i;
+                    break;
+                }
+
                 ui64 size = refs[i].BlobSize();
                 Y_ABORT_UNLESS(size != 0);
 
@@ -539,7 +545,8 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil
                 q[i].Set(refs[i + firstRequestIdx] /*must be index read*/);
             }
             SendToBSProxy(SelfId(), group, new TEvBlobStorage::TEvGet(q, (ui32)count, TInstant::Max(),
-                NKikimrBlobStorage::EGetHandleClass::FastRead, true, true, TEvBlobStorage::TEvGet::TForceBlockTabletData(Info->TabletID, BlockedGen)));
+                NKikimrBlobStorage::EGetHandleClass::FastRead, true, true, TEvBlobStorage::TEvGet::TForceBlockTabletData(
+                    Info->TabletID, refs[firstRequestIdx].Generation())));
             ++RequestsLeft;
 
             firstRequestIdx = endRequestIdx;