database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

mcol770

Browse Source
This commit is contained in:
david hill
2017-06-19 16:36:48 -05:00
parent 0599b7c3e9
commit 140bbdca0b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
procmon/main.cpp
View File

@ -168,8 +168,14 @@ int main(int argc, char **argv)
int moduleStatus = oam::ACTIVE; int moduleStatus = oam::ACTIVE;
string DBRootStorageType;
//check if currently configured as Parent OAM Module on startup //check if currently configured as Parent OAM Module on startup
if ( gOAMParentModuleFlag ) { if ( gOAMParentModuleFlag ) {
try {
oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
}
catch(...) {}
if ( ( config.OAMStandbyName() != oam::UnassignedName ) && if ( ( config.OAMStandbyName() != oam::UnassignedName ) &&
DBRootStorageType != "internal" ) { DBRootStorageType != "internal" ) {
//try for 20 minutes checking if the standby node is up //try for 20 minutes checking if the standby node is up
@ -337,6 +343,9 @@ int main(int argc, char **argv)
{ {
//run the module install script //run the module install script
string cmd = startup::StartUp::installDir() + "/bin/module_installer.sh " + " --installdir=" + startup::StartUp::installDir() + " --module=" + config.moduleType() + " > /dev/null 2>&1"; string cmd = startup::StartUp::installDir() + "/bin/module_installer.sh " + " --installdir=" + startup::StartUp::installDir() + " --module=" + config.moduleType() + " > /dev/null 2>&1";
log.writeLog(__LINE__, "run module_installer.sh", LOG_TYPE_DEBUG);
log.writeLog(__LINE__, cmd, LOG_TYPE_DEBUG);
system(cmd.c_str()); system(cmd.c_str());
} }
@ -357,7 +366,7 @@ int main(int argc, char **argv)
} }
catch(...) catch(...)
{ {
log.writeLog(__LINE__, "wating for good return from getModuleStatus", LOG_TYPE_DEBUG); log.writeLog(__LINE__, "waiting for good return from getModuleStatus", LOG_TYPE_DEBUG);
sleep (1); sleep (1);
} }
} }
@ -399,7 +408,6 @@ int main(int argc, char **argv)
} }
//hdfs / hadoop config //hdfs / hadoop config
string DBRootStorageType;
try { try {
oam.getSystemConfig( "DBRootStorageType", DBRootStorageType); oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
} }