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-1.1' into 1.1-merge-up-2018-10-05

Browse Source
This commit is contained in:
Andrew Hutchings
2018-10-05 18:40:07 +01:00
parent c0600d0da0 e183557b67
commit f1f13a09d1
22 changed files with 625 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
procmon/main.cpp
View File

@ -224,7 +224,7 @@ int main(int argc, char** argv)
}
catch (...) {}
if ( cloud == "amazon-ec2" )
if ( cloud == "amazon-ec2" || cloud == "amazon-vpc" ) {
{
if (!aMonitor.amazonIPCheck())
{
@ -1522,7 +1522,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
@ -1604,17 +1604,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);
}
@ -2695,22 +2698,6 @@ void processStatusMSG(messageqcpp::IOSocket* cfIos)
memcpy(fShmSystemStatus[0].StateChangeDate, oam.getCurrentTime().c_str(), DATESIZE);
log.writeLog(__LINE__, "statusControl: REQUEST RECEIVED: Set System State = " + oamState[state], LOG_TYPE_DEBUG);
}
//if DMLProc set to ACTIVE, set system state to ACTIVE if in an INIT state
if ( processName == "DMLProc" && state == oam::ACTIVE )
{
if ( fShmSystemStatus[0].OpState == oam::BUSY_INIT ||
fShmSystemStatus[0].OpState == oam::MAN_INIT ||
fShmSystemStatus[0].OpState == oam::AUTO_INIT )
{
fShmSystemStatus[0].OpState = state;
memcpy(fShmSystemStatus[0].StateChangeDate, oam.getCurrentTime().c_str(), DATESIZE);
log.writeLog(__LINE__, "statusControl: REQUEST RECEIVED: Set System State = " + oamState[state], LOG_TYPE_DEBUG);
}
BRM::DBRM dbrm;
dbrm.setSystemQueryReady(true);
}
}
break;