From a7f31cddbbe40b8795a186316252c3da1f0b6736 Mon Sep 17 00:00:00 2001 From: Evgeny Zverev Date: Mon, 5 Aug 2024 19:15:17 +0300 Subject: [PATCH 1/2] Ignore stored GCBarrierPreparation --- ydb/core/tx/columnshard/blobs_action/bs/blob_manager.cpp | 5 ++++- 1 file changed, 4 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..a1802b7c787d 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,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 From a5fb711c190f193769ce0b245b9eabd66a7dfcc4 Mon Sep 17 00:00:00 2001 From: Evgeny Zverev Date: Mon, 5 Aug 2024 19:24:00 +0300 Subject: [PATCH 2/2] log when differs --- ydb/core/tx/columnshard/blobs_action/bs/blob_manager.cpp | 4 +++- 1 file changed, 3 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 a1802b7c787d..4917e36d5984 100644 --- a/ydb/core/tx/columnshard/blobs_action/bs/blob_manager.cpp +++ b/ydb/core/tx/columnshard/blobs_action/bs/blob_manager.cpp @@ -145,7 +145,9 @@ bool TBlobManager::LoadState(IBlobManagerDb& db, const TTabletId selfTabletId) { if (!db.LoadGCBarrierPreparation(storedGCBarrierPreparation)) { return false; } - AFL_INFO(NKikimrServices::TX_COLUMNSHARD_BLOBS_BS)("mem_genstep", GCBarrierPreparation)("db_genstep", storedGCBarrierPreparation); + 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