thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-14 18:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

updates for comments, treat special case for string value max memory, and extract shared code out

Browse Source
This commit is contained in:
Sichen Zhao 2023-02-21 22:45:23 -08:00
parent e8d1a2f099
commit d0de9d5887
2 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/Common/AsynchronousMetrics.cpp
View File

@ -884,43 +884,14 @@ void AsynchronousMetrics::update(TimePoint update_time)
}
}
if (cgroupmem_limit_in_bytes || cgroupmem_usage_in_bytes || cgroupmem_v2_limit_in_bytes || cgroupmem_v2_usage_in_bytes)
if (cgroupmem_limit_in_bytes && cgroupmem_usage_in_bytes)
{
try
{
cgroupmem_limit_in_bytes->rewind();
cgroupmem_usage_in_bytes->rewind();
uint64_t cgroup_mem_limit_in_bytes = 0;
uint64_t cgroup_mem_usage_in_bytes = 0;
readText(cgroup_mem_limit_in_bytes, *cgroupmem_limit_in_bytes);
readText(cgroup_mem_usage_in_bytes, *cgroupmem_usage_in_bytes);
if (!cgroup_mem_limit_in_bytes && !cgroup_mem_limit_in_bytes)
{
cgroupmem_v2_limit_in_bytes->rewind();
cgroupmem_v2_usage_in_bytes->rewind();
readText(cgroup_mem_limit_in_bytes, *cgroupmem_v2_limit_in_bytes);
readText(cgroup_mem_usage_in_bytes, *cgroupmem_v2_usage_in_bytes);
}
if (cgroup_mem_limit_in_bytes && cgroup_mem_usage_in_bytes)
{
new_values["CgroupMemoryTotal"] = { cgroup_mem_limit_in_bytes, "The total amount of memory in cgroup, in bytes." };
new_values["CgroupMemoryUsed"] = { cgroup_mem_usage_in_bytes, "The amount of memory used in cgroup, in bytes." };
}
else
{
LOG_DEBUG(log, "Cannot read statistics about the cgroup memory total and used. Total got '{}', Used got '{}'.",
cgroup_mem_limit_in_bytes, cgroup_mem_usage_in_bytes);
}
}
catch (...)
{
tryLogCurrentException(__PRETTY_FUNCTION__);
}
updateCgroupMemoryMetrics(cgroupmem_limit_in_bytes, cgroupmem_usage_in_bytes);
}
if (cgroupmem_v2_limit_in_bytes && cgroupmem_v2_usage_in_bytes)
{
updateCgroupMemoryMetrics(cgroupmem_v2_limit_in_bytes, cgroupmem_v2_usage_in_bytes);
}
if (meminfo)
@ -1489,4 +1460,38 @@ void AsynchronousMetrics::update(TimePoint update_time)
values = new_values;
}
void AsynchronousMetrics::updateCgroupMemoryMetrics(std::optional<ReadBufferFromFilePRead> memoryLimitReadBuffer, std::optional<ReadBufferFromFilePRead> memoryUsageReadBuffer)
{
try {
memoryLimitReadBuffer->rewind();
memoryUsageReadBuffer->rewind();
uint64_t cgroup_mem_limit_in_bytes = 0;
uint64_t cgroup_mem_usage_in_bytes = 0;
string cgroup_mem_limit_str = "";
readText(cgroup_mem_limit_str, *memoryLimitReadBuffer);
if (std::isdigit(cgroup_mem_limit_str)) {
memoryLimitReadBuffer->rewind();
readText(cgroup_mem_limit_in_bytes, *memoryLimitReadBuffer);
}
readText(cgroup_mem_usage_in_bytes, *memoryUsageReadBuffer);
if (cgroup_mem_limit_in_bytes && cgroup_mem_usage_in_bytes)
{
new_values["CgroupMemoryTotal"] = { cgroup_mem_limit_in_bytes, "The total amount of memory in cgroup, in bytes. If stated zero, CgroupMemoryTotal is the same as OSMemoryTotal." };
new_values["CgroupMemoryUsed"] = { cgroup_mem_usage_in_bytes, "The amount of memory used in cgroup, in bytes." };
}
else
{
LOG_DEBUG(log, "Cannot read statistics about the cgroup memory total and used. Total got '{}', Used got '{}'.",
cgroup_mem_limit_in_bytes, cgroup_mem_usage_in_bytes);
}
}
catch (...)
{
tryLogCurrentException(__PRETTY_FUNCTION__);
}
}
}

3
src/Common/AsynchronousMetrics.h
View File

@ -110,6 +110,8 @@ private:
std::optional<ReadBufferFromFilePRead> cgroupmem_limit_in_bytes;
std::optional<ReadBufferFromFilePRead> cgroupmem_usage_in_bytes;
std::optional<ReadBufferFromFilePRead> cgroupmem_v2_limit_in_bytes;
std::optional<ReadBufferFromFilePRead> cgroupmem_v2_usage_in_bytes;
std::vector<std::unique_ptr<ReadBufferFromFilePRead>> thermal;
@ -202,6 +204,7 @@ private:
void openBlockDevices();
void openSensorsChips();
void openEDAC();
void updateCgroupMemoryMetrics(std::optional<ReadBufferFromFilePRead> memoryLimitReadBuffer, std::optional<ReadBufferFromFilePRead> memoryUsageReadBuffer);
#endif
std::unique_ptr<ThreadFromGlobalPool> thread;