Add a check for BLOCKED TEvGet with BlocksManager.

2 files changed, 10 insertions, 1 deletions

diff --git a/ydb/core/blob_depot/agent/storage_get.cpp b/ydb/core/blob_depot/agent/storage_get.cpp
index 004b0506ba..cdf8dae8bc 100644
--- a/ydb/core/blob_depot/agent/storage_get.cpp
+++ b/ydb/core/blob_depot/agent/storage_get.cpp
@@ -1,5 +1,6 @@
 #include "agent_impl.h"
 #include "blob_mapping_cache.h"
+#include "blocks.h"
 
 namespace NKikimr::NBlobDepot {
 
@@ -36,6 +37,14 @@ namespace NKikimr::NBlobDepot {
                     Agent.VirtualGroupId);
                 AnswersRemain = msg.QuerySize;
 
+                if (msg.ReaderTabletId && msg.ReaderTabletGeneration) {
+                    auto status = Agent.BlocksManager.CheckBlockForTablet(msg.ReaderTabletId.value(), msg.ReaderTabletGeneration.value(), this, nullptr);
+                    if (status == NKikimrProto::BLOCKED) {
+                        EndWithError(status, "Fail TEvGet due to BLOCKED tablet generation");
+                        return;
+                    }
+                }
+
                 for (ui32 i = 0; i < msg.QuerySize; ++i) {
                     auto& query = msg.Queries[i];
 
diff --git a/ydb/core/blobstorage/ut_blobstorage/blob_depot.cpp b/ydb/core/blobstorage/ut_blobstorage/blob_depot.cpp
index d194da5fc8..4ef1acb4e8 100644
--- a/ydb/core/blobstorage/ut_blobstorage/blob_depot.cpp
+++ b/ydb/core/blobstorage/ut_blobstorage/blob_depot.cpp
@@ -68,7 +68,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) {
         auto res = CaptureTEvGetResult(env, sender, true, true);
 
         // check that TEvGet returns BLOCKED
-        UNIT_ASSERT_VALUES_EQUAL(res->Get()->Status, NKikimrProto::OK);
+        UNIT_ASSERT_VALUES_EQUAL(res->Get()->Status, NKikimrProto::BLOCKED);
         UNIT_ASSERT_VALUES_EQUAL(res->Get()->Responses[0].Status, NKikimrProto::BLOCKED);
     }