thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fix

Browse Source
This commit is contained in:
Antonio Andelic 2024-07-22 14:58:00 +02:00
parent a3840179cc
commit 1c3f7d0fd0
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/server/Server.cpp
View File

@ -904,8 +904,6 @@ try
LOG_INFO(log, "Background threads finished in {} ms", watch.elapsedMilliseconds()); LOG_INFO(log, "Background threads finished in {} ms", watch.elapsedMilliseconds());
}); });
MemoryWorker memory_worker(global_context->getServerSettings().memory_worker_period_ms);
/// This object will periodically calculate some metrics. /// This object will periodically calculate some metrics.
ServerAsynchronousMetrics async_metrics( ServerAsynchronousMetrics async_metrics(
global_context, global_context,
@ -1198,6 +1196,8 @@ try
FailPointInjection::enableFromGlobalConfig(config()); FailPointInjection::enableFromGlobalConfig(config());
MemoryWorker memory_worker(global_context->getServerSettings().memory_worker_period_ms);
int default_oom_score = 0; int default_oom_score = 0;
#if !defined(NDEBUG) #if !defined(NDEBUG)

15
src/Common/MemoryWorker.cpp
View File

@ -2,8 +2,9 @@
#include <Common/Jemalloc.h> #include <Common/Jemalloc.h>
#include <Common/MemoryTracker.h> #include <Common/MemoryTracker.h>
#include <Common/formatReadable.h>
#include <Common/ProfileEvents.h> #include <Common/ProfileEvents.h>
#include <Common/formatReadable.h>
#include <Common/logger_useful.h>
namespace ProfileEvents namespace ProfileEvents
{ {
@ -23,6 +24,7 @@ namespace DB
MemoryWorker::MemoryWorker(uint64_t period_ms_) MemoryWorker::MemoryWorker(uint64_t period_ms_)
: period_ms(period_ms_) : period_ms(period_ms_)
{ {
LOG_INFO(getLogger("MemoryWorker"), "Starting background memory thread with period of {}ms", period_ms.count());
background_thread = ThreadFromGlobalPool([this] { backgroundThread(); }); background_thread = ThreadFromGlobalPool([this] { backgroundThread(); });
} }
@ -42,9 +44,10 @@ void MemoryWorker::backgroundThread()
{ {
JemallocMibCache<uint64_t> epoch_mib("epoch"); JemallocMibCache<uint64_t> epoch_mib("epoch");
JemallocMibCache<size_t> resident_mib("stats.resident"); JemallocMibCache<size_t> resident_mib("stats.resident");
JemallocMibCache<size_t> active_mib("stats.active");
JemallocMibCache<size_t> allocated_mib("stats.allocated"); JemallocMibCache<size_t> allocated_mib("stats.allocated");
JemallocMibCache<size_t> purge_mib("arena." STRINGIFY(MALLCTL_ARENAS_ALL) ".purge"); JemallocMibCache<size_t> purge_mib("arena." STRINGIFY(MALLCTL_ARENAS_ALL) ".purge");
bool first_run = false; bool first_run = true;
std::unique_lock lock(mutex); std::unique_lock lock(mutex);
while (true) while (true)
{ {
@ -55,6 +58,11 @@ void MemoryWorker::backgroundThread()
Stopwatch total_watch; Stopwatch total_watch;
epoch_mib.setValue(0); epoch_mib.setValue(0);
Int64 resident = resident_mib.getValue(); Int64 resident = resident_mib.getValue();
/// force update the allocated stat from jemalloc for the first run to cover the allocations we missed
/// during initialization
MemoryTracker::updateValues(resident, allocated_mib.getValue(), first_run);
if (resident > total_memory_tracker.getHardLimit()) if (resident > total_memory_tracker.getHardLimit())
{ {
Stopwatch purge_watch; Stopwatch purge_watch;
@ -63,9 +71,6 @@ void MemoryWorker::backgroundThread()
ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurgeTimeMicroseconds, purge_watch.elapsedMicroseconds()); ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurgeTimeMicroseconds, purge_watch.elapsedMicroseconds());
} }
/// force update the allocated stat from jemalloc for the first run to cover the allocations we missed
/// during initialization
MemoryTracker::updateValues(resident, allocated_mib.getValue(), first_run);
ProfileEvents::increment(ProfileEvents::MemoryWorkerRun); ProfileEvents::increment(ProfileEvents::MemoryWorkerRun);
ProfileEvents::increment(ProfileEvents::MemoryWorkerRunElapsedMicroseconds, total_watch.elapsedMicroseconds()); ProfileEvents::increment(ProfileEvents::MemoryWorkerRunElapsedMicroseconds, total_watch.elapsedMicroseconds());