aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorivanmorozov333 <ivanmorozov@ydb.tech>2024-08-15 15:32:47 +0300
committerGitHub <noreply@github.com>2024-08-15 15:32:47 +0300
commit3d60e1ed55ae2e97824f3125046a6df942e09931 (patch)
treea598205b778b78fa841e74dbf7cf4e4ce45d6f1d
parent1f7017f69a32b9861dcbfed800ebb69231a1d318 (diff)
downloadydb-3d60e1ed55ae2e97824f3125046a6df942e09931.tar.gz
fix snapshot tracing signals (#7821)
-rw-r--r--ydb/core/tx/columnshard/columnshard_impl.cpp3
-rw-r--r--ydb/core/tx/columnshard/inflight_request_tracker.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/ydb/core/tx/columnshard/columnshard_impl.cpp b/ydb/core/tx/columnshard/columnshard_impl.cpp
index 58064d21fa3..3ee0e3e087c 100644
--- a/ydb/core/tx/columnshard/columnshard_impl.cpp
+++ b/ydb/core/tx/columnshard/columnshard_impl.cpp
@@ -189,13 +189,14 @@ NOlap::TSnapshot TColumnShard::GetMinReadSnapshot() const {
ui64 delayMillisec = GetMaxReadStaleness().MilliSeconds();
ui64 passedStep = GetOutdatedStep();
ui64 minReadStep = (passedStep > delayMillisec ? passedStep - delayMillisec : 0);
- Counters.GetRequestsTracingCounters()->OnDefaultMinSnapshotInstant(TInstant::MilliSeconds(minReadStep));
if (auto ssClean = InFlightReadsTracker.GetSnapshotToClean()) {
if (ssClean->GetPlanStep() < minReadStep) {
+ Counters.GetRequestsTracingCounters()->OnDefaultMinSnapshotInstant(TInstant::MilliSeconds(ssClean->GetPlanStep()));
return *ssClean;
}
}
+ Counters.GetRequestsTracingCounters()->OnDefaultMinSnapshotInstant(TInstant::MilliSeconds(minReadStep));
return NOlap::TSnapshot::MaxForPlanStep(minReadStep);
}
diff --git a/ydb/core/tx/columnshard/inflight_request_tracker.cpp b/ydb/core/tx/columnshard/inflight_request_tracker.cpp
index ed23e2a3629..8db7aa5b288 100644
--- a/ydb/core/tx/columnshard/inflight_request_tracker.cpp
+++ b/ydb/core/tx/columnshard/inflight_request_tracker.cpp
@@ -23,7 +23,6 @@ void TInFlightReadsTracker::RemoveInFlightRequest(ui64 cookie, const NOlap::TVer
AFL_VERIFY(it != SnapshotsLive.end());
if (it->second.DelRequest(cookie, now)) {
SnapshotsLive.erase(it);
- Counters->OnSnapshotsInfo(SnapshotsLive.size(), GetSnapshotToClean());
}
}
@@ -33,6 +32,7 @@ void TInFlightReadsTracker::RemoveInFlightRequest(ui64 cookie, const NOlap::TVer
tracker->FreeBlob(committedBlob.GetBlobRange().GetBlobId());
}
}
+ Counters->OnSnapshotsInfo(SnapshotsLive.size(), GetSnapshotToClean());
RequestsMeta.erase(cookie);
}
@@ -110,6 +110,7 @@ std::unique_ptr<NTabletFlatExecutor::ITransaction> TInFlightReadsTracker::Ping(
for (auto&& i : snapshotsToFree) {
SnapshotsLive.erase(i);
}
+ Counters->OnSnapshotsInfo(SnapshotsLive.size(), GetSnapshotToClean());
if (snapshotsToFree.size() || snapshotsToSave.size()) {
NYDBTest::TControllers::GetColumnShardController()->OnRequestTracingChanges(snapshotsToSave, snapshotsToFree);
return std::make_unique<TTransactionSavePersistentSnapshots>(self, std::move(snapshotsToSave), std::move(snapshotsToFree));