diff options
| author | Dan Engelbrecht <[email protected]> | 2024-09-04 09:27:32 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2024-09-04 09:27:32 +0200 |
| commit | 1e52c3e1f479a802d151a4d162bb0b9174d22cf7 (patch) | |
| tree | 96427532f0df1e735fc5ced8087fb4996d021be5 /src/zenstore/cache | |
| parent | delay oplog read (#141) (diff) | |
| download | zen-1e52c3e1f479a802d151a4d162bb0b9174d22cf7.tar.xz zen-1e52c3e1f479a802d151a4d162bb0b9174d22cf7.zip | |
move gc logs to gc logger (#142)
- Improvement: Move GC logging in callback functions into "gc" context
Diffstat (limited to 'src/zenstore/cache')
| -rw-r--r-- | src/zenstore/cache/cachedisklayer.cpp | 15 | ||||
| -rw-r--r-- | src/zenstore/cache/structuredcachestore.cpp | 10 |
2 files changed, 24 insertions, 1 deletions
diff --git a/src/zenstore/cache/cachedisklayer.cpp b/src/zenstore/cache/cachedisklayer.cpp index 940f78c30..9c350b11d 100644 --- a/src/zenstore/cache/cachedisklayer.cpp +++ b/src/zenstore/cache/cachedisklayer.cpp @@ -3063,6 +3063,8 @@ public: { ZEN_TRACE_CPU("Z$::Bucket::CompactStore"); + auto Log = [&Ctx]() { return Ctx.Logger; }; + Stopwatch Timer; const auto _ = MakeGuard([&] { Reset(m_ExpiredStandaloneKeys); @@ -3290,6 +3292,8 @@ ZenCacheDiskLayer::CacheBucket::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats) { ZEN_TRACE_CPU("Z$::Bucket::RemoveExpiredData"); + auto Log = [&Ctx]() { return Ctx.Logger; }; + size_t TotalEntries = 0; Stopwatch Timer; @@ -3457,6 +3461,8 @@ ZenCacheDiskLayer::CacheBucket::GetReferencesLocked(GcCtx& Ctx, std::vector<IoHa { ZEN_TRACE_CPU("Z$::Bucket::GetReferencesLocked"); + auto Log = [&Ctx]() { return Ctx.Logger; }; + auto GetAttachments = [&](MemoryView Data) -> bool { if (ValidateCompactBinary(Data, CbValidateMode::Default) == CbValidateError::None) { @@ -3632,6 +3638,8 @@ public: { ZEN_TRACE_CPU("Z$::Bucket::PreCache"); + auto Log = [&Ctx]() { return Ctx.Logger; }; + Stopwatch Timer; const auto _ = MakeGuard([&] { if (!Ctx.Settings.Verbose) @@ -3659,6 +3667,8 @@ public: { ZEN_TRACE_CPU("Z$::Bucket::UpdateLockedState"); + auto Log = [&Ctx]() { return Ctx.Logger; }; + Stopwatch Timer; const auto _ = MakeGuard([&] { if (!Ctx.Settings.Verbose) @@ -3689,6 +3699,9 @@ public: virtual void RemoveUsedReferencesFromSet(GcCtx& Ctx, HashSet& IoCids) override { ZEN_TRACE_CPU("Z$::Bucket::RemoveUsedReferencesFromSet"); + + auto Log = [&Ctx]() { return Ctx.Logger; }; + size_t InitialCount = IoCids.size(); Stopwatch Timer; const auto _ = MakeGuard([&] { @@ -3723,6 +3736,8 @@ ZenCacheDiskLayer::CacheBucket::CreateReferenceCheckers(GcCtx& Ctx) { ZEN_TRACE_CPU("Z$::Bucket::CreateReferenceCheckers"); + auto Log = [&Ctx]() { return Ctx.Logger; }; + Stopwatch Timer; const auto _ = MakeGuard([&] { if (!Ctx.Settings.Verbose) diff --git a/src/zenstore/cache/structuredcachestore.cpp b/src/zenstore/cache/structuredcachestore.cpp index ac1db2a4e..25d20748e 100644 --- a/src/zenstore/cache/structuredcachestore.cpp +++ b/src/zenstore/cache/structuredcachestore.cpp @@ -1033,10 +1033,12 @@ ZenCacheStore::GetBucketInfo(std::string_view NamespaceName, std::string_view Bu } std::vector<RwLock::SharedLockScope> -ZenCacheStore::LockState(GcCtx&) +ZenCacheStore::LockState(GcCtx& Ctx) { ZEN_TRACE_CPU("CacheStore::LockState"); + auto Log = [&Ctx]() { return Ctx.Logger; }; + std::vector<RwLock::SharedLockScope> Locks; Locks.emplace_back(RwLock::SharedLockScope(m_NamespacesLock)); for (auto& NamespaceIt : m_Namespaces) @@ -1135,6 +1137,8 @@ public: { ZEN_TRACE_CPU("Z$::UpdateLockedState"); + auto Log = [&Ctx]() { return Ctx.Logger; }; + Stopwatch Timer; std::vector<ZenCacheDiskLayer::CacheBucket*> AddedBuckets; @@ -1191,6 +1195,8 @@ public: { ZEN_TRACE_CPU("Z$::RemoveUsedReferencesFromSet"); + auto Log = [&Ctx]() { return Ctx.Logger; }; + size_t InitialCount = IoCids.size(); Stopwatch Timer; const auto _ = MakeGuard([&] { @@ -1227,6 +1233,8 @@ ZenCacheStore::CreateReferenceCheckers(GcCtx& Ctx) { ZEN_TRACE_CPU("CacheStore::CreateReferenceCheckers"); + auto Log = [&Ctx]() { return Ctx.Logger; }; + Stopwatch Timer; const auto _ = MakeGuard([&] { if (!Ctx.Settings.Verbose) |