database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-18 13:54:11 +03:00
Code Activity

move down some of the config variables

Browse Source
This commit is contained in:
david hill
2017-06-19 10:40:35 -05:00
parent ebaf24473c
commit 166193471f
1 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
procmon/main.cpp
View File

@@ -130,53 +130,6 @@ int main(int argc, char **argv)
setlocale(LC_ALL, systemLang.c_str());
// if amazon cloud, check and update Instance IP Addresses and volumes
try {
oam.getSystemConfig( "Cloud", cloud);
}
catch(...) {}
if ( cloud == "amazon-ec2" ) {
if(!aMonitor.amazonIPCheck()) {
log.writeLog(__LINE__, "ERROR: amazonIPCheck failed, exiting", LOG_TYPE_CRITICAL);
sleep(2);
string cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /dev/null 2>&1";
system(cmd.c_str());
exit(1);
}
}
//get gluster config
try {
oam.getSystemConfig( "GlusterConfig", GlusterConfig);
}
catch(...)
{
GlusterConfig = "n";
}
if ( GlusterConfig == "y" ) {
system("mount -a > /dev/null 2>&1");
}
//hdfs / hadoop config
string DBRootStorageType;
try {
oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
}
catch(...) {}
if ( DBRootStorageType == "hdfs" )
HDFS = true;
//PMwithUM config
try {
oam.getSystemConfig( "PMwithUM", PMwithUM);
}
catch(...) {
PMwithUM = "n";
}
//define entry if missing
Config* sysConfig = Config::makeConfig();
if ( gOAMParentModuleFlag )
@@ -333,7 +286,7 @@ int main(int argc, char **argv)
{
bool fresh = false;
// not active Parent, get updated Columnstore.xml, retry in case ProcMgr isn't up yet
// not active Parent, get updated Columnstore.xml, retry in case ProcMgr isn't up yet
if (!HDFS)
{
//check if this is a fresh install, meaning the Columnstore.xml file is not setup
@@ -416,6 +369,53 @@ int main(int argc, char **argv)
exit (1);
}
// if amazon cloud, check and update Instance IP Addresses and volumes
try {
oam.getSystemConfig( "Cloud", cloud);
}
catch(...) {}
if ( cloud == "amazon-ec2" ) {
if(!aMonitor.amazonIPCheck()) {
log.writeLog(__LINE__, "ERROR: amazonIPCheck failed, exiting", LOG_TYPE_CRITICAL);
sleep(2);
string cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /dev/null 2>&1";
system(cmd.c_str());
exit(1);
}
}
//get gluster config
try {
oam.getSystemConfig( "GlusterConfig", GlusterConfig);
}
catch(...)
{
GlusterConfig = "n";
}
if ( GlusterConfig == "y" ) {
system("mount -a > /dev/null 2>&1");
}
//hdfs / hadoop config
string DBRootStorageType;
try {
oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
}
catch(...) {}
if ( DBRootStorageType == "hdfs" )
HDFS = true;
//PMwithUM config
try {
oam.getSystemConfig( "PMwithUM", PMwithUM);
}
catch(...) {
PMwithUM = "n";
}
//check if module is in a DISABLED state
bool DISABLED = false;
if ( moduleStatus == oam::MAN_DISABLED ||