Merge 3a71fc5 into e62a642

Author: ivanmorozov333

ydb/core/tx/columnshard/engines/scheme/tiering/tier_info.cpp

@@ -19,12 +19,15 @@ std::optional<TInstant> TTierInfo::ScalarToInstant(const std::shared_ptr<arrow::
     }
 }
 
-TTiering::TTieringContext TTiering::GetTierToMove(const std::shared_ptr<arrow::Scalar>& max, const TInstant now) const {
+TTiering::TTieringContext TTiering::GetTierToMove(const std::shared_ptr<arrow::Scalar>& max, const TInstant now, const bool skipEviction) const {
     AFL_VERIFY(OrderedTiers.size());
     std::optional<TString> nextTierName;
     std::optional<TDuration> nextTierDuration;
     for (auto& tierRef : GetOrderedTiers()) {
         auto& tierInfo = tierRef.Get();
+        if (skipEviction && tierInfo.GetName() != NTiering::NCommon::DeleteTierName) {
+            continue;
+        }
         auto mpiOpt = tierInfo.ScalarToInstant(max);
         Y_ABORT_UNLESS(mpiOpt);
         const TInstant maxTieringPortionInstant = *mpiOpt;

ydb/core/tx/columnshard/engines/scheme/tiering/tier_info.h

@@ -149,7 +149,7 @@ class TTiering {
         }
     };
 
-    TTieringContext GetTierToMove(const std::shared_ptr<arrow::Scalar>& max, const TInstant now) const;
+    TTieringContext GetTierToMove(const std::shared_ptr<arrow::Scalar>& max, const TInstant now, const bool skipEviction) const;
 
     const TTiersMap& GetTierByName() const {
         return TierByName;

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

@@ -43,7 +43,8 @@ std::optional<TTieringActualizer::TFullActualizationInfo> TTieringActualizer::Bu
                 max = it->second;
             }
         }
-        auto tieringInfo = Tiering->GetTierToMove(max, now);
+        const bool skipEviction = !NYDBTest::TControllers::GetColumnShardController()->CheckPortionForEvict(portion);
+        auto tieringInfo = Tiering->GetTierToMove(max, now, skipEviction);
         AFL_TRACE(NKikimrServices::TX_COLUMNSHARD)("tiering_info", tieringInfo.DebugString());
         std::optional<i64> d;
         std::set<TString> storagesWrite;
@@ -149,13 +150,7 @@ void TTieringActualizer::DoExtractTasks(
             }
             bool limitEnriched = false;
             for (auto&& p : portions) {
-                auto portion = externalContext.GetPortionVerified(p);
-                if (!address.WriteIs(NBlobOperations::TGlobal::DefaultStorageId) && !address.WriteIs(NTiering::NCommon::DeleteTierName)) {
-                    if (!NYDBTest::TControllers::GetColumnShardController()->CheckPortionForEvict(portion)) {
-                        Counters.SkipEvictionForCompaction->Add(1);
-                        continue;
-                    }
-                }
+                const auto& portion = externalContext.GetPortionVerified(p);
                 auto info = BuildActualizationInfo(*portion, tasksContext.GetActualInstant());
                 AFL_VERIFY(info);
                 auto portionScheme = portion->GetSchema(VersionedIndex);