1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-25 20:23:16 +03:00

MCOL-3842: Fix logging and retry count for MessageThread startup waiting.

This commit is contained in:
benthompson15
2020-04-06 15:25:02 -05:00
parent 78117414de
commit 8458ed0a66
2 changed files with 4 additions and 3 deletions

View File

@@ -414,7 +414,8 @@ int main(int argc, char** argv)
}
// This will never work.....
// TODO: This is called before MessageThread is created.
// Doesn't break anything but can be removed as it's done after MessageThread creation.
try
{
oam.distributeConfigFile();

View File

@@ -9195,7 +9195,7 @@ int ProcessManager::switchParentOAMModule(std::string newActiveModuleName)
runStandby = false;
int retryCount = 0;
//sleep, give time for message thread to startup
while (!MsgThreadActive && retryCount < 5)
while (!MsgThreadActive && retryCount < 10)
{
log.writeLog(__LINE__, "Waiting for Message Thread...", LOG_TYPE_DEBUG);
sleep(5);
@@ -10104,7 +10104,7 @@ int ProcessManager::OAMParentModuleChange()
if ( ( config.ServerInstallType() == oam::INSTALL_COMBINE_DM_UM_PM) &&
( moduleNameList.size() <= 0 && config.moduleType() == "pm") )
{
int status = 0;
// Do Nothing
}
else
{