Skip to content

stable-25-3-1: Fix bad portions count #28410

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

Open
wants to merge 1 commit into
base: stable-25-3-1
Choose a base branch
from
+9 −9
Open

stable-25-3-1: Fix bad portions count #28410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions ydb/core/tx/columnshard/counters/engine_logs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,24 +91,24 @@ void TEngineLogsCounters::OnActualizationTask(const ui32 evictCount, const ui32
}
}

void TEngineLogsCounters::TPortionsInfoGuard::OnNewPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion) const {
void TEngineLogsCounters::TPortionsInfoGuard::OnNewPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion) {
const ui32 producedId = (ui32)portion->GetProduced();
PortionRecordCountGuards[producedId]->Add(portion->GetRecordsCount(), 1);
PortionSizeGuards[producedId]->Add(portion->GetTotalBlobBytes(), 1);

if (portion->GetTotalBlobBytes() <= GetBadPortionSizeLimit()) {
BadPortionsCount->Add(1);
BadPortionsCount.Add(1);
}
}

void TEngineLogsCounters::TPortionsInfoGuard::OnDropPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion) const {
void TEngineLogsCounters::TPortionsInfoGuard::OnDropPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion) {
const ui32 producedId = (ui32)portion->GetProduced();
THashSet<NOlap::TUnifiedBlobId> blobIds;
PortionRecordCountGuards[producedId]->Sub(portion->GetRecordsCount(), 1);
PortionSizeGuards[producedId]->Sub(portion->GetTotalBlobBytes(), 1);

if (portion->GetTotalBlobBytes() <= GetBadPortionSizeLimit()) {
BadPortionsCount->Sub(1);
BadPortionsCount.Sub(1);
}
}

Expand Down
10 changes: 5 additions & 5 deletions ydb/core/tx/columnshard/counters/engine_logs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,14 @@ class TEngineLogsCounters: public TCommonCountersOwner {
std::vector<std::shared_ptr<TIncrementalHistogram::TGuard>> BlobGuards;
std::vector<std::shared_ptr<TIncrementalHistogram::TGuard>> PortionRecordCountGuards;
std::vector<std::shared_ptr<TIncrementalHistogram::TGuard>> PortionSizeGuards;
NMonitoring::TDynamicCounters::TCounterPtr BadPortionsCount;
TValueGuard BadPortionsCount;

public:
TPortionsInfoGuard(const std::vector<std::shared_ptr<TIncrementalHistogram>>& distrBlobs,
const std::vector<std::shared_ptr<TIncrementalHistogram>>& distrPortionSize,
const std::vector<std::shared_ptr<TIncrementalHistogram>>& distrRecordsCount,
NMonitoring::TDynamicCounters::TCounterPtr badPortionsCount)
NMonitoring::TDynamicCounters::TCounterPtr badPortionsCount) :
BadPortionsCount(badPortionsCount)
{
for (auto&& i : distrBlobs) {
BlobGuards.emplace_back(i->BuildGuard());
Expand All @@ -258,12 +259,11 @@ class TEngineLogsCounters: public TCommonCountersOwner {
for (auto&& i : distrRecordsCount) {
PortionRecordCountGuards.emplace_back(i->BuildGuard());
}
BadPortionsCount = badPortionsCount;
}


void OnNewPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion) const;
void OnDropPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion) const;
void OnNewPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion);
void OnDropPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion);

};

Expand Down
Loading