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

remove amazon start when module is stopped

Browse Source
This commit is contained in:
david hill
2016-05-25 15:08:00 -05:00
parent a2264bea70
commit f9775e7ce6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oam/etc/Calpont.xml
View File

@@ -231,7 +231,7 @@
<PrimaryUMModuleName>unassigned</PrimaryUMModuleName>
<ModuleHeartbeatPeriod>1</ModuleHeartbeatPeriod>
<ModuleHeartbeatCount>3</ModuleHeartbeatCount>
<ModuleProcMonWaitCount>30</ModuleProcMonWaitCount> // 2.5 minutes
<ModuleProcMonWaitCount>6</ModuleProcMonWaitCount> // 2.5 minutes
<!-- Disabled
<ProcessHeartbeatPeriod>-1</ProcessHeartbeatPeriod>
-->

8
procmgr/main.cpp
View File

@@ -1383,12 +1383,12 @@ void pingDeviceThread()
//restart module processes
int retry = 0;
int ModuleProcMonWaitCount = 30;
int ModuleProcMonWaitCount = 6;
try{
oam.getSystemConfig("ModuleProcMonWaitCount", ModuleProcMonWaitCount);
}
catch(...) {
ModuleProcMonWaitCount = 30;
ModuleProcMonWaitCount = 6;
}
for ( ; retry < ModuleProcMonWaitCount ; retry ++ )
@@ -1702,7 +1702,7 @@ void pingDeviceThread()
// return values = 'ip address' for running or rebooting, stopped or terminated
string currentIPAddr = oam.getEC2InstanceIpAddress(hostName);
if (currentIPAddr == "stopped")
/* if (currentIPAddr == "stopped")
{ // start instance
log.writeLog(__LINE__, "Instance in stopped state, try starting it: " + hostName, LOG_TYPE_DEBUG);
@@ -1754,7 +1754,7 @@ void pingDeviceThread()
currentIPAddr = "terminated";
}
}
*/
if ( currentIPAddr == "terminated")
{
//check if down module was Standby OAM, if so find another one