diff options
| author | ivanmorozov333 <[email protected]> | 2024-03-20 09:58:24 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-03-20 09:58:24 +0300 |
| commit | 0c712d16fd90c32cfbfa1ff95cefa2c238ceefc2 (patch) | |
| tree | ab500d51b9d39309df360db4a859583af7b97b2e | |
| parent | 39728d817646a9dcf7d0a7cb6e1edaff97b363e3 (diff) | |
fix tests (#2956)
| -rw-r--r-- | ydb/core/tx/columnshard/blobs_action/bs/blob_manager.cpp | 3 | ||||
| -rw-r--r-- | ydb/core/tx/columnshard/blobs_action/bs/gc.h | 2 |
2 files changed, 2 insertions, 3 deletions
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 e08cd61cc79..751f5ea3afd 100644 --- a/ydb/core/tx/columnshard/blobs_action/bs/blob_manager.cpp +++ b/ydb/core/tx/columnshard/blobs_action/bs/blob_manager.cpp @@ -261,17 +261,16 @@ std::shared_ptr<NBlobOperations::NBlobStorage::TGCTask> TBlobManager::BuildGCTas }; TTabletsByBlob extractedOld = BlobsToDelete.ExtractBlobs(predRemoveOld, blobsGCCountLimit - extractedToRemoveFromDB.GetSize()); + extractedToRemoveFromDB.Add(extractedOld); TTabletId tabletId; TUnifiedBlobId unifiedBlobId; while (extractedOld.ExtractFront(tabletId, unifiedBlobId)) { - AFL_VERIFY(tabletId == SelfTabletId); auto logoBlobId = unifiedBlobId.GetLogoBlobId(); AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("to_delete_gc", logoBlobId); NBlobOperations::NBlobStorage::TGCTask::TGCLists& gl = perGroupGCListsInFlight[unifiedBlobId.GetDsGroup()]; BlobsManagerCounters.OnCollectDropExplicit(logoBlobId.BlobSize()); gl.DontKeepList.insert(logoBlobId); } - extractedToRemoveFromDB.Add(extractedOld); if (extractedToRemoveFromDB.GetSize() >= blobsGCCountLimit) { newCollectGenSteps.clear(); } diff --git a/ydb/core/tx/columnshard/blobs_action/bs/gc.h b/ydb/core/tx/columnshard/blobs_action/bs/gc.h index 6f61639fd0e..86f348fe9fc 100644 --- a/ydb/core/tx/columnshard/blobs_action/bs/gc.h +++ b/ydb/core/tx/columnshard/blobs_action/bs/gc.h @@ -30,7 +30,7 @@ protected: virtual void DoOnExecuteTxAfterCleaning(NColumnShard::TColumnShard& self, TBlobManagerDb& dbBlobs) override; virtual bool DoOnCompleteTxAfterCleaning(NColumnShard::TColumnShard& self, const std::shared_ptr<IBlobsGCAction>& taskAction) override; virtual bool DoIsEmpty() const override { - return ListsByGroupId.empty() && KeepsToErase.empty(); + return false; } public: |