Ignore stored GCBarrierPreparation

zverevgeny · zverevgeny · commit a7f31cddbbe4 · 2024-08-05T19:15:17.000+03:00
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,12 @@ 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;
     }
+    AFL_INFO(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

Original file line number	Diff line number	Diff line change
`@@ -140,9 +140,12 @@ bool TBlobManager::LoadState(IBlobManagerDb& db, const TTabletId selfTabletId) {`
`140`	`140`	`if (!db.LoadLastGcBarrier(LastCollectedGenStep)) {`
`141`	`141`	`return false;`
`142`	`142`	`}`
`143`		`- if (!db.LoadGCBarrierPreparation(GCBarrierPreparation)) {`
	`143`	`+ //https://github.com/ydb-platform/ydb/issues/7468`
	`144`	`+ TGenStep storedGCBarrierPreparation;`
	`145`	`+ if (!db.LoadGCBarrierPreparation(storedGCBarrierPreparation)) {`
`144`	`146`	`return false;`
`145`	`147`	`}`
	`148`	`+ AFL_INFO(NKikimrServices::TX_COLUMNSHARD_BLOBS_BS)("mem_genstep", GCBarrierPreparation)("db_genstep", storedGCBarrierPreparation);`
`146`	`149`	`AFL_VERIFY(!GCBarrierPreparation.Generation() \|\| LastCollectedGenStep <= GCBarrierPreparation)("prepared", GCBarrierPreparation)("last", LastCollectedGenStep);`
`147`	`150`
`148`	`151`	`// Load the keep and delete queues`