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

23
procmgr/main.cpp
View File

@@ -49,7 +49,6 @@ string cloud;
bool amazon = false;
string PMInstanceType;
string UMInstanceType;
string AmazonPMFailover = "y";
string GlusterConfig = "n";
bool rootUser = true;
string USER = "root";
@@ -144,7 +143,6 @@ int main(int argc, char **argv)
{
oam.getSystemConfig("PMInstanceType", PMInstanceType);
oam.getSystemConfig("UMInstanceType", UMInstanceType);
oam.getSystemConfig("AmazonPMFailover", AmazonPMFailover);
amazon = true;
}
@@ -1281,9 +1279,8 @@ void pingDeviceThread()
int status;
// if pm, move dbroots back to pm
if ( ( moduleName.find("pm") == 0 && !amazon ) ||
( moduleName.find("pm") == 0 && amazon && downActiveOAMModule ) ||
( moduleName.find("pm") == 0 && amazon && AmazonPMFailover == "y") ) {
if ( ( moduleName.find("pm") == 0 ) ||
( moduleName.find("pm") == 0 && downActiveOAMModule ) ) {
//restart to get the versionbuffer files closed so it can be unmounted
processManager.restartProcessType("WriteEngineServer", moduleName);
@@ -1559,8 +1556,8 @@ void pingDeviceThread()
aManager.sendAlarmReport(moduleName.c_str(), MODULE_DOWN_AUTO, SET);
// if pm, move dbroots back to pm
if ( ( moduleName.find("pm") == 0 && !amazon ) ||
( moduleName.find("pm") == 0 && amazon && downActiveOAMModule ) ) {
if ( ( moduleName.find("pm") == 0 ) ||
( moduleName.find("pm") == 0 && downActiveOAMModule ) ) {
//move dbroots to other modules
try {
log.writeLog(__LINE__, "Call autoMovePmDbroot", LOG_TYPE_DEBUG);
@@ -1593,9 +1590,9 @@ void pingDeviceThread()
log.writeLog(__LINE__, "Module failed to auto start: " + moduleName, LOG_TYPE_CRITICAL);
if ( amazon )
processManager.setSystemState(oam::FAILED);
else
// if ( amazon )
// processManager.setSystemState(oam::FAILED);
// else
processManager.setSystemState(oam::ACTIVE);
//set query system state ready
@@ -1663,8 +1660,8 @@ void pingDeviceThread()
log.writeLog(__LINE__, "'dbrmctl reload' done", LOG_TYPE_DEBUG);
// if pm, move dbroots to other pms
if ( !amazon ||
( amazon && AmazonPMFailover == "y") ) {
// if ( !amazon ||
// ( amazon ) ) {
if( moduleName.find("pm") == 0 ) {
try {
log.writeLog(__LINE__, "Call autoMovePmDbroot", LOG_TYPE_DEBUG);
@@ -1683,7 +1680,7 @@ void pingDeviceThread()
log.writeLog(__LINE__, "EXCEPTION ERROR on autoMovePmDbroot: Caught unknown exception!", LOG_TYPE_ERROR);
}
}
}
// }
// if Cloud Instance
// state = running, then instance is rebooting, monitor for recovery