From ccf98e2c3fc5d8a915c9c71b61e5db672a87f85a Mon Sep 17 00:00:00 2001 From: zverevgeny Date: Mon, 5 Aug 2024 22:15:51 +0300 Subject: [PATCH] Ignore stored GCBarrierPreparation (#7473) --- ydb/core/tx/columnshard/blobs_action/bs/blob_manager.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 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 index b4fb522e3d06..cda7186419f6 100644 --- 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 < LastCollectedGenStep) { + AFL_WARN(NKikimrServices::TX_COLUMNSHARD_BLOBS_BS)("mem_genstep", GCBarrierPreparation)("last_genstep", LastCollectedGenStep)("db_genstep", storedGCBarrierPreparation); + } AFL_VERIFY(!GCBarrierPreparation.Generation() || LastCollectedGenStep <= GCBarrierPreparation)("prepared", GCBarrierPreparation)("last", LastCollectedGenStep); // Load the keep and delete queues