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

Merge branch 'develop-1.1' into dev-merge-up-20180430

Browse Source
This commit is contained in:
Andrew Hutchings
2018-04-30 08:51:58 +01:00
parent 6324d4917f 585388188f
commit b58122589b
11 changed files with 341 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
procmon/processmonitor.cpp
View File

@@ -484,6 +484,26 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
log.writeLog(__LINE__, "MSG RECEIVED: Stop process request on " + processName);
int requestStatus = API_SUCCESS;
// check for mysql
if ( processName == "mysqld" )
{
try
{
oam.actionMysqlCalpont(MYSQL_STOP);
}
catch (...)
{}
ackMsg << (ByteStream::byte) ACK;
ackMsg << (ByteStream::byte) STOP;
ackMsg << (ByteStream::byte) API_SUCCESS;
mq.write(ackMsg);
log.writeLog(__LINE__, "STOP: ACK back to ProcMgr, return status = " + oam.itoa((int) API_SUCCESS));
break;
}
processList::iterator listPtr;
processList* aPtr = config.monitoredListPtr();
listPtr = aPtr->begin();
@@ -533,6 +553,26 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
msg >> manualFlag;
log.writeLog(__LINE__, "MSG RECEIVED: Start process request on: " + processName);
// check for mysql
if ( processName == "mysqld" )
{
try
{
oam.actionMysqlCalpont(MYSQL_START);
}
catch (...)
{}
ackMsg << (ByteStream::byte) ACK;
ackMsg << (ByteStream::byte) START;
ackMsg << (ByteStream::byte) API_SUCCESS;
mq.write(ackMsg);
log.writeLog(__LINE__, "START: ACK back to ProcMgr, return status = " + oam.itoa((int) API_SUCCESS));
break;
}
ProcessConfig processconfig;
ProcessStatus processstatus;
@@ -645,7 +685,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
int requestStatus = API_SUCCESS;
// check for mysql restart
if ( processName == "mysql" )
if ( processName == "mysqld" )
{
try
{
@@ -5350,12 +5390,11 @@ int ProcessMonitor::runMasterRep(std::string& masterLogFile, std::string& master
//skip if module is not ACTIVE
int opState = oam::ACTIVE;
bool degraded;
oam.getModuleStatus(moduleName, opState, degraded);
if (opState != oam::ACTIVE)
continue;
// int opState = oam::ACTIVE;
// bool degraded;
// oam.getModuleStatus(moduleName, opState, degraded);
// if (opState != oam::ACTIVE)
// continue;
bool passwordError = false;