database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge branch 'develop' into MCOL-520

Browse Source
This commit is contained in:
david hill
2018-10-08 14:23:48 -05:00
committed by GitHub
parent f48b92e46f ca7cb9a7b1
commit 101b36acb6
63 changed files with 4305 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
procmon/main.cpp
View File

@ -268,7 +268,7 @@ int main(int argc, char** argv)
}
catch (...) {}
if ( cloud == "amazon-ec2" )
if ( cloud == "amazon-ec2" || cloud == "amazon-vpc" )
{
if (!aMonitor.amazonIPCheck())
{
@ -1565,7 +1565,7 @@ static void chldHandleThread(MonitorConfig config)
catch (...)
{}
// check if process failover is needed due to process outage
// check if Mdoule failover is needed due to process outage
aMonitor.checkModuleFailover((*listPtr).ProcessName);
//check the db health
@ -1647,17 +1647,20 @@ static void chldHandleThread(MonitorConfig config)
restartStatus = " restart failed with hard failure, don't retry!!";
(*listPtr).processID = 0;
// check if process failover is needed due to process outage
// check if Module failover is needed due to process outage
aMonitor.checkModuleFailover((*listPtr).ProcessName);
break;
}
else
{
if ( (*listPtr).processID != oam::API_MINOR_FAILURE )
{
//restarted successful
//Inform Process Manager that Process restart
aMonitor.processRestarted( (*listPtr).ProcessName, false);
break;
}
}
}
// restart failed with minor error, sleep and try
sleep(5);
}
@ -2602,6 +2605,7 @@ void processStatusMSG(messageqcpp::IOSocket* cfIos)
BRM::DBRM dbrm;
dbrm.setSystemQueryReady(true);
}
}
break;