database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +03:00
Code Activity

MCOL-1138 - fix issue where no HOT_STANDBY procmgr existed after pm1 outage

Browse Source
This commit is contained in:
david hill
2018-01-22 14:19:12 -06:00
parent 201813d63d
commit 1a16847cd5
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
procmgr/main.cpp
View File

@@ -1828,9 +1828,18 @@ void pingDeviceThread()
break;
// if disabled and not amazon, skip
if (opState == oam::AUTO_DISABLED && !amazon)
if ( (opState == oam::AUTO_DISABLED) && !amazon)
break;
// if disabled, amazon,and NOT terminated skip
if ( (opState == oam::AUTO_DISABLED) && amazon)
{
// return values = 'ip address' for running or rebooting, stopped or terminated
string currentIPAddr = oam.getEC2InstanceIpAddress(hostName);
if ( currentIPAddr != "terminated")
break;
}
log.writeLog(__LINE__, "module failed to respond to pings: " + moduleName, LOG_TYPE_WARNING);
//bump module ping failure counter

5
procmgr/processmanager.cpp
View File

@@ -9455,7 +9455,7 @@ int ProcessManager::OAMParentModuleChange()
//restart/reinit processes to force their release of the controller node port
if ( ( config.ServerInstallType() == oam::INSTALL_COMBINE_DM_UM_PM) &&
( moduleNameList.size() <= 1 && config.moduleType() == "pm") )
( moduleNameList.size() <= 0 && config.moduleType() == "pm") )
{
status = 0;
}
@@ -9710,7 +9710,8 @@ std::string ProcessManager::getStandbyModule()
//already have a hot-standby
return "";
if ( backupStandbyModule != "NONE" )
if ( ( backupStandbyModule != "NONE" ) ||
( newStandbyModule != "NONE" ) )
continue;
if ( systemprocessstatus.processstatus[i].ProcessName == "ProcessManager" &&