database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-20 01:42:27 +03:00
Code Activity

MCOL-770 - change non-distrubute install to not do any ssh betweeen pm1 at startup

Browse Source
This commit is contained in:
david hill
2017-06-16 16:53:48 -05:00
parent 08ed507640
commit ebaf24473c
3 changed files with 616 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
procmon/main.cpp
View File

@@ -331,9 +331,16 @@ int main(int argc, char **argv)
}
else
{
// not active Parent, get updated Columnstore.xml, retry in case ProcMgr isn't up yet
bool fresh = false;
// 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
string procmgrIpadd = sysConfig->getConfig("ProcMgr", "IPAddr");
if ( procmgrIpadd == "0.0.0.0" )
fresh = true;
int count = 0;
while(true)
{
@@ -360,6 +367,26 @@ int main(int argc, char **argv)
MonitorConfig config;
}
//get Distributed Install
string DistributedInstall = "y";
try
{
oam.getSystemConfig("DistributedInstall", DistributedInstall);
}
catch (...)
{
log.writeLog(__LINE__, "addModule - ERROR: get DistributedInstall", LOG_TYPE_ERROR);
}
//check for a fresh install on a non-distrubuted install setup
if ( DistributedInstall == "n" && fresh )
{
//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";
system(cmd.c_str());
}
// not OAM parent module, delay starting until a successful get status is performed
// makes sure the Parent OAM ProcMon is fully ready
while(true)