Skip to content

dont scan unappropriate portions in tiering #11509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 12, 2024
Merged

dont scan unappropriate portions in tiering #11509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a71fc5
dont scan unappropriate portions in tiering
ivanmorozov333 Nov 12, 2024
d875083
fix
ivanmorozov333 Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ydb/core/tx/columnshard/engines/scheme/tiering/tier_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/engines/scheme/tiering/tier_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 3 additions & 8 deletions ydb/core/tx/columnshard/engines/storage/actualizer/tiering/tiering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/columnshard/hooks/abstract/abstract.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ ui64 ICSController::GetGuaranteeIndexationStartBytesLimit() const {
return DoGetGuaranteeIndexationStartBytesLimit(defaultValue);
}

bool ICSController::CheckPortionForEvict(const std::shared_ptr<NOlap::TPortionInfo>& portion) const {
return portion->HasRuntimeFeature(NOlap::TPortionInfo::ERuntimeFeature::Optimized) && !portion->HasInsertWriteId();
bool ICSController::CheckPortionForEvict(const NOlap::TPortionInfo& portion) const {
return portion.HasRuntimeFeature(NOlap::TPortionInfo::ERuntimeFeature::Optimized) && !portion.HasInsertWriteId();
}

}
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/hooks/abstract/abstract.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class ICSController {
const std::set<NOlap::TSnapshot>& /*snapshotsToSave*/, const std::set<NOlap::TSnapshot>& /*snapshotsToRemove*/) {
}

virtual bool CheckPortionForEvict(const std::shared_ptr<NOlap::TPortionInfo>& portion) const;
virtual bool CheckPortionForEvict(const NOlap::TPortionInfo& portion) const;

TDuration GetPingCheckPeriod() const {
const TDuration defaultValue = 0.6 * GetReadTimeoutClean();
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/test_helper/controllers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class TWaitCompactionController: public NYDBTest::NColumnShard::TController {
return TDuration::Zero();
}
public:
virtual bool CheckPortionForEvict(const std::shared_ptr<TPortionInfo>& portion) const override {
virtual bool CheckPortionForEvict(const TPortionInfo& portion) const override {
if (SkipSpecialCheckForEvict) {
return true;
} else {
Expand Down
Loading