diff options
Diffstat (limited to 'zenserver')
| -rw-r--r-- | zenserver/cache/structuredcachestore.cpp | 34 | ||||
| -rw-r--r-- | zenserver/projectstore.cpp | 33 |
2 files changed, 34 insertions, 33 deletions
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp index 9773c2ed2..91ae452a8 100644 --- a/zenserver/cache/structuredcachestore.cpp +++ b/zenserver/cache/structuredcachestore.cpp @@ -312,7 +312,7 @@ ZenCacheNamespace::GatherReferences(GcContext& GcCtx) { Stopwatch Timer; const auto Guard = - MakeGuard([&] { ZEN_INFO("cache gathered all references from '{}' in {}", m_RootDir, NiceTimeSpanMs(Timer.GetElapsedTimeMs())); }); + MakeGuard([&] { ZEN_DEBUG("cache gathered all references from '{}' in {}", m_RootDir, NiceTimeSpanMs(Timer.GetElapsedTimeMs())); }); access_tracking::AccessTimes AccessTimes; m_MemLayer.GatherAccessTimes(AccessTimes); @@ -1204,13 +1204,13 @@ ZenCacheDiskLayer::CacheBucket::GatherReferences(GcContext& GcCtx) Stopwatch TotalTimer; const auto _ = MakeGuard([&] { - ZEN_INFO("gathered references from '{}' in {} write lock: {} ({}), read lock: {} ({})", - m_BucketDir / m_BucketName, - NiceTimeSpanMs(TotalTimer.GetElapsedTimeMs()), - NiceLatencyNs(WriteBlockTimeUs), - NiceLatencyNs(WriteBlockLongestTimeUs), - NiceLatencyNs(ReadBlockTimeUs), - NiceLatencyNs(ReadBlockLongestTimeUs)); + ZEN_DEBUG("gathered references from '{}' in {} write lock: {} ({}), read lock: {} ({})", + m_BucketDir / m_BucketName, + NiceTimeSpanMs(TotalTimer.GetElapsedTimeMs()), + NiceLatencyNs(WriteBlockTimeUs), + NiceLatencyNs(WriteBlockLongestTimeUs), + NiceLatencyNs(ReadBlockTimeUs), + NiceLatencyNs(ReadBlockLongestTimeUs)); }); const GcClock::TimePoint ExpireTime = @@ -1295,7 +1295,7 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx) { ZEN_TRACE_CPU("Z$::DiskLayer::CacheBucket::CollectGarbage"); - ZEN_INFO("collecting garbage from '{}'", m_BucketDir / m_BucketName); + ZEN_DEBUG("collecting garbage from '{}'", m_BucketDir / m_BucketName); Stopwatch TotalTimer; uint64_t WriteBlockTimeUs = 0; @@ -1344,7 +1344,7 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx) }); if (DeleteCacheKeys.empty()) { - ZEN_INFO("garbage collect SKIPPED, for '{}', no expired cache keys found", m_BucketDir / m_BucketName); + ZEN_DEBUG("garbage collect SKIPPED, for '{}', no expired cache keys found", m_BucketDir / m_BucketName); return; } @@ -1361,7 +1361,7 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx) }); if (m_Index.empty()) { - ZEN_INFO("garbage collect SKIPPED, for '{}', container is empty", m_BucketDir / m_BucketName); + ZEN_DEBUG("garbage collect SKIPPED, for '{}', container is empty", m_BucketDir / m_BucketName); return; } BlockStoreState = m_BlockStore.GetReclaimSnapshotState(); @@ -1506,12 +1506,12 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx) { m_BlockStore.ReclaimSpace(BlockStoreState, ChunkLocations, KeepChunkIndexes, m_PayloadAlignment, true); uint64_t CurrentTotalSize = TotalSize(); - ZEN_INFO("garbage collect from '{}' DISABLED, found #{} {} chunks of total #{} {}", - m_BucketDir / m_BucketName, - DeleteCount, - 0, // NiceBytes(TotalSize - NewTotalSize), - CurrentTotalSize, - NiceBytes(CurrentTotalSize)); + ZEN_DEBUG("garbage collect from '{}' DISABLED, found #{} {} chunks of total #{} {}", + m_BucketDir / m_BucketName, + DeleteCount, + 0, // NiceBytes(TotalSize - NewTotalSize), + CurrentTotalSize, + NiceBytes(CurrentTotalSize)); return; } diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index c60d5b405..c3f10c9cd 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -919,8 +919,9 @@ ProjectStore::Project::GatherReferences(GcContext& GcCtx) ZEN_TRACE_CPU("ProjectStore::Project::GatherReferences"); Stopwatch Timer; - const auto Guard = MakeGuard( - [&] { ZEN_INFO("gathered references from project store project {} in {}", Identifier, NiceTimeSpanMs(Timer.GetElapsedTimeMs())); }); + const auto Guard = MakeGuard([&] { + ZEN_DEBUG("gathered references from project store project {} in {}", Identifier, NiceTimeSpanMs(Timer.GetElapsedTimeMs())); + }); // GatherReferences needs to check all existing oplogs std::vector<std::string> OpLogs = ScanForOplogs(); @@ -1084,11 +1085,11 @@ ProjectStore::GatherReferences(GcContext& GcCtx) size_t ExpiredProjectCount = 0; Stopwatch Timer; const auto Guard = MakeGuard([&] { - ZEN_INFO("gathered references from '{}' in {}, found {} active projects and {} expired projects", - m_ProjectBasePath.string(), - NiceTimeSpanMs(Timer.GetElapsedTimeMs()), - ProjectCount, - ExpiredProjectCount); + ZEN_DEBUG("gathered references from '{}' in {}, found {} active projects and {} expired projects", + m_ProjectBasePath.string(), + NiceTimeSpanMs(Timer.GetElapsedTimeMs()), + ProjectCount, + ExpiredProjectCount); }); DiscoverProjects(); @@ -1125,11 +1126,11 @@ ProjectStore::CollectGarbage(GcContext& GcCtx) Stopwatch Timer; const auto Guard = MakeGuard([&] { - ZEN_INFO("garbage collect from '{}' DONE after {}, found {} active projects and {} expired projects", - m_ProjectBasePath.string(), - NiceTimeSpanMs(Timer.GetElapsedTimeMs()), - ProjectCount, - ExpiredProjectCount); + ZEN_DEBUG("garbage collect from '{}' DONE after {}, found {} active projects and {} expired projects", + m_ProjectBasePath.string(), + NiceTimeSpanMs(Timer.GetElapsedTimeMs()), + ProjectCount, + ExpiredProjectCount); }); std::vector<Ref<Project>> ExpiredProjects; @@ -1149,7 +1150,7 @@ ProjectStore::CollectGarbage(GcContext& GcCtx) if (ExpiredProjects.empty()) { - ZEN_INFO("garbage collect SKIPPED, for '{}', no expired projects found", m_ProjectBasePath.string()); + ZEN_DEBUG("garbage collect SKIPPED, for '{}', no expired projects found", m_ProjectBasePath.string()); return; } @@ -1167,20 +1168,20 @@ ProjectStore::CollectGarbage(GcContext& GcCtx) RwLock::ExclusiveLockScope _(m_ProjectsLock); if (!Project->IsExpired()) { - ZEN_INFO("ProjectStore::CollectGarbage skipped garbage collect of project '{}'. Project no longer expired.", ProjectId); + ZEN_DEBUG("ProjectStore::CollectGarbage skipped garbage collect of project '{}'. Project no longer expired.", ProjectId); continue; } bool Success = Project->PrepareForDelete(PathToRemove); if (!Success) { - ZEN_INFO("ProjectStore::CollectGarbage skipped garbage collect of project '{}'. Project folder is locked.", ProjectId); + ZEN_DEBUG("ProjectStore::CollectGarbage skipped garbage collect of project '{}'. Project folder is locked.", ProjectId); continue; } m_Projects.erase(Project->Identifier); ProjectId = Project->Identifier; } - ZEN_INFO("ProjectStore::CollectGarbage garbage collected project '{}'. Removing storage on disk", ProjectId); + ZEN_DEBUG("ProjectStore::CollectGarbage garbage collected project '{}'. Removing storage on disk", ProjectId); if (PathToRemove.empty()) { continue; |