database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-10-31 18:30:33 +03:00
Code Activity

change amazon failover logic, make work like normal system

Browse Source
This commit is contained in:
david hill
2016-03-02 14:27:29 -06:00
parent f38cfc6480
commit 92bf40fcbb
6 changed files with 47 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
procmgr/processmanager.cpp
View File

@@ -53,7 +53,6 @@ extern string USER;
extern bool HDFS;
extern string localHostName;
extern string PMwithUM;
extern string AmazonPMFailover;
typedef map<string, int> moduleList;
extern moduleList moduleInfoList;
@@ -8626,7 +8625,7 @@ int ProcessManager::OAMParentModuleChange()
noAckCount = 0;
//if Amazon Parent PM is restarting, monitor when back active and take needed actions
if (amazonParentRestart)
/* if (amazonParentRestart)
{
log.writeLog(__LINE__, "Amazon Parent pinging, waiting until it's active", LOG_TYPE_DEBUG);
sleep(60);
@@ -8659,7 +8658,7 @@ int ProcessManager::OAMParentModuleChange()
sleep(5);
}
}
*/
sleep(1);
break;
}
@@ -8837,7 +8836,7 @@ int ProcessManager::OAMParentModuleChange()
{}
//do amazon failover
if (amazon && AmazonPMFailover == "n")
/* if (amazon && AmazonPMFailover == "n")
{
log.writeLog(__LINE__, " ", LOG_TYPE_DEBUG);
log.writeLog(__LINE__, "*** OAMParentModule outage, AmazonPMFailover not set, wating for instance to restart ***", LOG_TYPE_DEBUG);
@@ -8912,7 +8911,7 @@ int ProcessManager::OAMParentModuleChange()
//clear and go monitor again
failover = false;
}
}*/
}
}
@@ -9187,9 +9186,7 @@ int ProcessManager::OAMParentModuleChange()
}
//restart DDLProc/DMLProc to perform any rollbacks, if needed
//dont rollback in amazon, wait until down pm recovers
if ( ( config.ServerInstallType() != oam::INSTALL_COMBINE_DM_UM_PM )
&& !amazon ) {
if ( ( config.ServerInstallType() != oam::INSTALL_COMBINE_DM_UM_PM ) ) {
processManager.restartProcessType("DDLProc", config.moduleName());
sleep(1);
processManager.restartProcessType("DMLProc", config.moduleName());