database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2026-01-06 08:21:10 +03:00
Code Activity

MCOL-379 - fix false critical mem alarm

Browse Source
This commit is contained in:
David Hill
2017-05-26 16:28:34 -05:00
parent c92b1d6471
commit 9c7434ba52
4 changed files with 59 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
oamapps/serverMonitor/memoryMonitor.cpp
View File

@@ -32,10 +32,11 @@ using namespace logging;
using namespace servermonitor;
//using namespace procheartbeat;
unsigned long totalMem;
ProcessMemoryList pml;
int swapFlag = 0;
uint64_t totalMem;
pthread_mutex_t MEMORY_LOCK;
/*****************************************************************************************
@@ -62,7 +63,7 @@ void memoryMonitor()
//set monitoring period to 60 seconds
int monitorPeriod = MONITOR_PERIOD;
utils::CGroupConfigurator cg;
utils::CGroupConfigurator cg;
while(true)
{
@@ -87,12 +88,11 @@ void memoryMonitor()
//get memory stats
totalMem = cg.getTotalMemory();
uint64_t freeMem = cg.getFreeMemory();
uint64_t usedMem = totalMem - freeMem;
uint64_t usedMem = totalMem - freeMem;
//get swap stats
uint64_t totalSwap = cg.getTotalSwapSpace();
uint64_t usedSwap = cg.getSwapInUse();
uint64_t totalSwap = cg.getTotalSwapSpace();
uint64_t usedSwap = cg.getSwapInUse();
if ( totalSwap == 0 ) {
swapUsagePercent = 0;
@@ -136,13 +136,34 @@ void memoryMonitor()
else
memoryUsagePercent = (usedMem / (totalMem / 100)) + 1;
/*LoggingID lid(SERVER_MONITOR_LOG_ID);
MessageLog ml(lid);
Message msg;
Message::Args args;
args.add("memoryUsagePercent ");
args.add((uint64_t) memoryUsagePercent);
args.add("usedMem ");
args.add((uint64_t) usedMem);
args.add("totalMem ");
args.add((uint64_t) totalMem);
msg.format(args);
ml.logInfoMessage(msg);
*/
//first time called, log
//adjust if over 100%
if ( swapUsagePercent < 0 )
swapUsagePercent = 0;
if ( swapUsagePercent > 100 )
swapUsagePercent = 100;
if ( memoryUsagePercent < 0 )
memoryUsagePercent = 0;
if ( memoryUsagePercent > 100 )
memoryUsagePercent = 100;
// check for Memory alarms
if (memoryUsagePercent >= memoryCritical && memoryCritical > 0 ) {
if ( monitorPeriod == MONITOR_PERIOD ) {
//first time called, log
//adjust if over 100%
if ( memoryUsagePercent > 100 )
memoryUsagePercent = 100;
LoggingID lid(SERVER_MONITOR_LOG_ID);
MessageLog ml(lid);