1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
This commit is contained in:
david hill
2017-06-19 15:32:48 -05:00
parent 95008d1c13
commit 0599b7c3e9
4 changed files with 590 additions and 653 deletions

View File

@ -169,13 +169,7 @@ int main(int argc, char **argv)
int moduleStatus = oam::ACTIVE;
//check if currently configured as Parent OAM Module on startup
string DBRootStorageType;
if ( gOAMParentModuleFlag ) {
try {
oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
}
catch(...) {}
if ( ( config.OAMStandbyName() != oam::UnassignedName ) &&
DBRootStorageType != "internal" ) {
//try for 20 minutes checking if the standby node is up
@ -405,6 +399,7 @@ int main(int argc, char **argv)
}
//hdfs / hadoop config
string DBRootStorageType;
try {
oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
}