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

Merge branch 'develop-1.1' into MCOL-1523

Browse Source
This commit is contained in:
david hill
2018-09-10 14:15:32 -05:00
committed by GitHub
parent 8b0507b987 a3cc11e003
commit 43b97e7fa3
30 changed files with 542 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
procmgr/processmanager.cpp
View File

@@ -836,10 +836,15 @@ void processMSG(messageqcpp::IOSocket* cfIos)
status = processManager.disableModule(moduleName, true);
log.writeLog(__LINE__, "Disable Module Completed on " + moduleName, LOG_TYPE_INFO);
processManager.recycleProcess(moduleName);
//check for SIMPLEX Processes on mate might need to be started
processManager.checkSimplexModule(moduleName);
processManager.setSystemState(oam::ACTIVE);
//set query system state ready
processManager.setQuerySystemState(true);
processManager.setSystemState(oam::ACTIVE);
}
else
{
@@ -7068,6 +7073,7 @@ void startSystemThread(oam::DeviceNetworkList Devicenetworklist)
else
processManager.setSystemState(oam::FAILED);
// exit thread
log.writeLog(__LINE__, "startSystemThread Exit", LOG_TYPE_DEBUG);
startsystemthreadStatus = status;