Merge d763d9f into 1b4620e

Author: ivanmorozov333

ydb/core/tx/columnshard/engines/storage/actualizer/tiering/tiering.cpp

@@ -105,12 +105,16 @@ void TTieringActualizer::DoRemovePortion(const ui64 portionId) {
 void TTieringActualizer::DoExtractTasks(TTieringProcessContext& tasksContext, const TExternalTasksContext& externalContext, TInternalTasksContext& /*internalContext*/) {
     THashSet<ui64> portionIds;
     for (auto&& [address, addressPortions] : PortionIdByWaitDuration) {
+        if (addressPortions.GetPortions().size() && tasksContext.Now - StartInstant < addressPortions.GetPortions().begin()->first) {
+            Counters.SkipEvictionForLimit->Add(1);
+            continue;
+        }
         if (!tasksContext.IsRWAddressAvailable(address)) {
             Counters.SkipEvictionForLimit->Add(1);
             continue;
         }
         for (auto&& [duration, portions] : addressPortions.GetPortions()) {
-            if (duration - (tasksContext.Now - StartInstant) > TDuration::Zero()) {
+            if (tasksContext.Now - StartInstant < duration) {
                 break;
             }
             bool limitEnriched = false;
@@ -140,28 +144,29 @@ void TTieringActualizer::DoExtractTasks(TTieringProcessContext& tasksContext, co
             }
         }
     }
+    if (portionIds.size()) {
+        ui64 waitDurationEvict = 0;
+        ui64 waitQueueEvict = 0;
+        ui64 waitDurationDelete = 0;
+        ui64 waitQueueDelete = 0;
+        for (auto&& i : PortionIdByWaitDuration) {
+            std::shared_ptr<NColumnShard::TValueAggregationClient> waitDurationSignal;
+            std::shared_ptr<NColumnShard::TValueAggregationClient> queueSizeSignal;
+            if (i.first.WriteIs(NTiering::NCommon::DeleteTierName)) {
+                i.second.CorrectSignals(waitQueueDelete, waitDurationDelete, tasksContext.Now - StartInstant);
+            } else {
+                i.second.CorrectSignals(waitQueueEvict, waitDurationEvict, tasksContext.Now - StartInstant);
+            }
+        }
+        Counters.DifferenceWaitToDelete->SetValue(waitDurationDelete);
+        Counters.DifferenceWaitToEvict->SetValue(waitDurationEvict);
+        Counters.QueueSizeToDelete->SetValue(waitQueueDelete);
+        Counters.QueueSizeToEvict->SetValue(waitQueueEvict);
+    }
     for (auto&& i : portionIds) {
         RemovePortion(i);
     }
 
-    ui64 waitDurationEvict = 0;
-    ui64 waitQueueEvict = 0;
-    ui64 waitDurationDelete = 0;
-    ui64 waitQueueDelete = 0;
-    for (auto&& i : PortionIdByWaitDuration) {
-        std::shared_ptr<NColumnShard::TValueAggregationClient> waitDurationSignal;
-        std::shared_ptr<NColumnShard::TValueAggregationClient> queueSizeSignal;
-        if (i.first.WriteIs(NTiering::NCommon::DeleteTierName)) {
-            i.second.CorrectSignals(waitQueueDelete, waitDurationDelete, tasksContext.Now - StartInstant);
-        } else {
-            i.second.CorrectSignals(waitQueueEvict, waitDurationEvict, tasksContext.Now - StartInstant);
-        }
-    }
-    Counters.DifferenceWaitToDelete->SetValue(waitDurationDelete);
-    Counters.DifferenceWaitToEvict->SetValue(waitDurationEvict);
-    Counters.QueueSizeToDelete->SetValue(waitQueueDelete);
-    Counters.QueueSizeToEvict->SetValue(waitQueueEvict);
-
 }
 
 void TTieringActualizer::Refresh(const std::optional<TTiering>& info, const TAddExternalContext& externalContext) {

ydb/core/tx/columnshard/engines/storage/granule.h

@@ -150,6 +150,7 @@ class TGranuleMeta: TNonCopyable {
     std::shared_ptr<TGranulesStat> Stats;
     std::shared_ptr<NStorageOptimizer::IOptimizerPlanner> OptimizerPlanner;
     std::shared_ptr<NActualizer::TGranuleActualizationIndex> ActualizationIndex;
+    mutable TInstant LastActualizations = TInstant::Zero();
     std::map<NArrow::TReplaceKey, THashMap<ui64, std::shared_ptr<TPortionInfo>>> PortionsByPK;
 
     void OnBeforeChangePortion(const std::shared_ptr<TPortionInfo> portionBefore);
@@ -198,8 +199,12 @@ class TGranuleMeta: TNonCopyable {
     }
 
     void BuildActualizationTasks(NActualizer::TTieringProcessContext& context) const {
+        if (context.Now - LastActualizations < TDuration::Seconds(1)) {
+            return;
+        }
         NActualizer::TExternalTasksContext extTasks(Portions);
         ActualizationIndex->ExtractActualizationTasks(context, extTasks);
+        LastActualizations = context.Now;
     }
 
     std::shared_ptr<TColumnEngineChanges> GetOptimizationTask(std::shared_ptr<TGranuleMeta> self, const std::shared_ptr<NDataLocks::TManager>& locksManager) const {