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

Cleaned up the hacks made so far.

This commit is contained in:
Patrick LeBlanc
2019-06-10 09:41:03 -05:00
parent 6193d2cda2
commit d454f84b82
4 changed files with 39 additions and 43 deletions

View File

@ -1014,6 +1014,9 @@ int main(int argc, char** argv)
(*listPtr).DepModuleName,
(*listPtr).LogFile,
initType);
// StorageManager doesn't send the "I'm online" msg to Proc*.
// Just mark it active for now. TODO: make it use the ping fcn in IDB* instead.
if (listPtr->ProcessName == "StorageManager")
{
log.writeLog(__LINE__, "StorageManager WTF? 1", LOG_TYPE_DEBUG);
@ -1071,12 +1074,15 @@ int main(int argc, char** argv)
(*listPtr).DepModuleName,
(*listPtr).LogFile,
initType);
if (listPtr->ProcessName == "StorageManager")
{
log.writeLog(__LINE__, "StorageManager WTF? 2", LOG_TYPE_DEBUG);
oam.setProcessStatus("StorageManager", boost::get<0>(oam.getModuleInfo()),
oam::ACTIVE, listPtr->processID);
}
// StorageManager doesn't send the "I'm online" msg to Proc*.
// Just mark it active for now. TODO: make it use the ping fcn in IDB* instead.
if (listPtr->ProcessName == "StorageManager")
{
log.writeLog(__LINE__, "StorageManager WTF? 2", LOG_TYPE_DEBUG);
oam.setProcessStatus("StorageManager", boost::get<0>(oam.getModuleInfo()),
oam::ACTIVE, listPtr->processID);
}
string restartStatus;
@ -1664,6 +1670,9 @@ static void chldHandleThread(MonitorConfig config)
(*listPtr).DepModuleName,
(*listPtr).LogFile,
initStatus);
// StorageManager doesn't send the "I'm online" msg to Proc*.
// Just mark it active for now. TODO: make it use the ping fcn in IDB* instead.
if (listPtr->ProcessName == "StorageManager")
{
log.writeLog(__LINE__, "StorageManager WTF? 3", LOG_TYPE_DEBUG);