database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-25 20:23:16 +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

7
procmgr/main.cpp
View File

@@ -1617,7 +1617,7 @@ void pingDeviceThread()
if (moduleInfoList[moduleName] >= ModuleHeartbeatCount ||
opState == oam::DOWN || opState == oam::AUTO_DISABLED)
{
log.writeLog(__LINE__, "Module alive, bring it back online: " + moduleName, LOG_TYPE_DEBUG);
log.writeLog(__LINE__, "*** Module alive, bring it back online: " + moduleName, LOG_TYPE_DEBUG);
string PrimaryUMModuleName = config.moduleName();
@@ -2089,7 +2089,7 @@ void pingDeviceThread()
{
//Log failure, issue alarm, set moduleOpState
Configuration config;
log.writeLog(__LINE__, "module is down: " + moduleName, LOG_TYPE_CRITICAL);
log.writeLog(__LINE__, "*** module is down: " + moduleName, LOG_TYPE_CRITICAL);
//set query system state not ready
processManager.setQuerySystemState(false);
@@ -2173,9 +2173,6 @@ void pingDeviceThread()
// resume the dbrm
oam.dbrmctl("resume");
log.writeLog(__LINE__, "'dbrmctl resume' done", LOG_TYPE_DEBUG);
//set recycle process
processManager.recycleProcess(moduleName);
}
// return values = 'ip address' for running or rebooting, stopped or terminated