Skip to content

Commit 813cf03

Browse files
authored
stable-25-3-1: Fix bad portions count (#28410)
2 parents 62b90b0 + f727ffa commit 813cf03

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

ydb/core/tx/columnshard/counters/engine_logs.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,24 +91,24 @@ void TEngineLogsCounters::OnActualizationTask(const ui32 evictCount, const ui32
9191
}
9292
}
9393

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

9999
if (portion->GetTotalBlobBytes() <= GetBadPortionSizeLimit()) {
100-
BadPortionsCount->Add(1);
100+
BadPortionsCount.Add(1);
101101
}
102102
}
103103

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

110110
if (portion->GetTotalBlobBytes() <= GetBadPortionSizeLimit()) {
111-
BadPortionsCount->Sub(1);
111+
BadPortionsCount.Sub(1);
112112
}
113113
}
114114

ydb/core/tx/columnshard/counters/engine_logs.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,14 @@ class TEngineLogsCounters: public TCommonCountersOwner {
241241
std::vector<std::shared_ptr<TIncrementalHistogram::TGuard>> BlobGuards;
242242
std::vector<std::shared_ptr<TIncrementalHistogram::TGuard>> PortionRecordCountGuards;
243243
std::vector<std::shared_ptr<TIncrementalHistogram::TGuard>> PortionSizeGuards;
244-
NMonitoring::TDynamicCounters::TCounterPtr BadPortionsCount;
244+
TValueGuard BadPortionsCount;
245245

246246
public:
247247
TPortionsInfoGuard(const std::vector<std::shared_ptr<TIncrementalHistogram>>& distrBlobs,
248248
const std::vector<std::shared_ptr<TIncrementalHistogram>>& distrPortionSize,
249249
const std::vector<std::shared_ptr<TIncrementalHistogram>>& distrRecordsCount,
250-
NMonitoring::TDynamicCounters::TCounterPtr badPortionsCount)
250+
NMonitoring::TDynamicCounters::TCounterPtr badPortionsCount) :
251+
BadPortionsCount(badPortionsCount)
251252
{
252253
for (auto&& i : distrBlobs) {
253254
BlobGuards.emplace_back(i->BuildGuard());
@@ -258,12 +259,11 @@ class TEngineLogsCounters: public TCommonCountersOwner {
258259
for (auto&& i : distrRecordsCount) {
259260
PortionRecordCountGuards.emplace_back(i->BuildGuard());
260261
}
261-
BadPortionsCount = badPortionsCount;
262262
}
263263

264264

265-
void OnNewPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion) const;
266-
void OnDropPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion) const;
265+
void OnNewPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion);
266+
void OnDropPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion);
267267

268268
};
269269

0 commit comments

Comments
 (0)