Merge bc9c826 into 13965ec

ydb-platform · Sep 13, 2024 · 3e17ac0 · 3e17ac0
2 parents 13965ec + bc9c826
commit 3e17ac0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ydb/core/tx/columnshard/engines/changes/cleanup_portions.cpp b/ydb/core/tx/columnshard/engines/changes/cleanup_portions.cpp
@@ -36,7 +36,9 @@ void TCleanupPortionsColumnEngineChanges::DoWriteIndexOnExecute(NColumnShard::TC
 
 void TCleanupPortionsColumnEngineChanges::DoWriteIndexOnComplete(NColumnShard::TColumnShard* self, TWriteIndexCompleteContext& context) {
     for (auto& portionInfo : PortionsToDrop) {
-        if (!context.EngineLogs.ErasePortion(portionInfo)) {
+        if (!context.EngineLogs.GetGranuleOptional(portionInfo.GetPathId())) {
+            AFL_WARN(NKikimrServices::TX_COLUMNSHARD)("event", "portion granule removed already")("portion", portionInfo.DebugString());
+        } else if (!context.EngineLogs.ErasePortion(portionInfo)) {
             AFL_WARN(NKikimrServices::TX_COLUMNSHARD)("event", "Cannot erase portion")("portion", portionInfo.DebugString());
         }
     }