Skip to content

Commit 3d60e1e

Browse files
fix snapshot tracing signals (#7821)
1 parent 1f7017f commit 3d60e1e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

ydb/core/tx/columnshard/columnshard_impl.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,14 @@ NOlap::TSnapshot TColumnShard::GetMinReadSnapshot() const {
189189
ui64 delayMillisec = GetMaxReadStaleness().MilliSeconds();
190190
ui64 passedStep = GetOutdatedStep();
191191
ui64 minReadStep = (passedStep > delayMillisec ? passedStep - delayMillisec : 0);
192-
Counters.GetRequestsTracingCounters()->OnDefaultMinSnapshotInstant(TInstant::MilliSeconds(minReadStep));
193192

194193
if (auto ssClean = InFlightReadsTracker.GetSnapshotToClean()) {
195194
if (ssClean->GetPlanStep() < minReadStep) {
195+
Counters.GetRequestsTracingCounters()->OnDefaultMinSnapshotInstant(TInstant::MilliSeconds(ssClean->GetPlanStep()));
196196
return *ssClean;
197197
}
198198
}
199+
Counters.GetRequestsTracingCounters()->OnDefaultMinSnapshotInstant(TInstant::MilliSeconds(minReadStep));
199200
return NOlap::TSnapshot::MaxForPlanStep(minReadStep);
200201
}
201202

ydb/core/tx/columnshard/inflight_request_tracker.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ void TInFlightReadsTracker::RemoveInFlightRequest(ui64 cookie, const NOlap::TVer
2323
AFL_VERIFY(it != SnapshotsLive.end());
2424
if (it->second.DelRequest(cookie, now)) {
2525
SnapshotsLive.erase(it);
26-
Counters->OnSnapshotsInfo(SnapshotsLive.size(), GetSnapshotToClean());
2726
}
2827
}
2928

@@ -33,6 +32,7 @@ void TInFlightReadsTracker::RemoveInFlightRequest(ui64 cookie, const NOlap::TVer
3332
tracker->FreeBlob(committedBlob.GetBlobRange().GetBlobId());
3433
}
3534
}
35+
Counters->OnSnapshotsInfo(SnapshotsLive.size(), GetSnapshotToClean());
3636

3737
RequestsMeta.erase(cookie);
3838
}
@@ -110,6 +110,7 @@ std::unique_ptr<NTabletFlatExecutor::ITransaction> TInFlightReadsTracker::Ping(
110110
for (auto&& i : snapshotsToFree) {
111111
SnapshotsLive.erase(i);
112112
}
113+
Counters->OnSnapshotsInfo(SnapshotsLive.size(), GetSnapshotToClean());
113114
if (snapshotsToFree.size() || snapshotsToSave.size()) {
114115
NYDBTest::TControllers::GetColumnShardController()->OnRequestTracingChanges(snapshotsToSave, snapshotsToFree);
115116
return std::make_unique<TTransactionSavePersistentSnapshots>(self, std::move(snapshotsToSave), std::move(snapshotsToFree));

0 commit comments

Comments
 (0)