Merge a5fb711 into 3fb7fa2

ydb-platform · Aug 5, 2024 · 3f5550a · 3f5550a
2 parents 3fb7fa2 + a5fb711
commit 3f5550a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ydb/core/tx/columnshard/blobs_action/bs/blob_manager.cpp b/ydb/core/tx/columnshard/blobs_action/bs/blob_manager.cpp
@@ -140,9 +140,14 @@ bool TBlobManager::LoadState(IBlobManagerDb& db, const TTabletId selfTabletId) {
     if (!db.LoadLastGcBarrier(LastCollectedGenStep)) {
         return false;
     }
-    if (!db.LoadGCBarrierPreparation(GCBarrierPreparation)) {
+    //https://github.com/ydb-platform/ydb/issues/7468
+    TGenStep storedGCBarrierPreparation;
+    if (!db.LoadGCBarrierPreparation(storedGCBarrierPreparation)) {
         return false;
     }
+    if (storedGCBarrierPreparation != GCBarrierPreparation) {
+        AFL_WARN(NKikimrServices::TX_COLUMNSHARD_BLOBS_BS)("mem_genstep", GCBarrierPreparation)("db_genstep", storedGCBarrierPreparation);
+    }
     AFL_VERIFY(!GCBarrierPreparation.Generation() || LastCollectedGenStep <= GCBarrierPreparation)("prepared", GCBarrierPreparation)("last", LastCollectedGenStep);
 
     // Load the keep and delete queues