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

MCOL-943

Browse Source
This commit is contained in:
root
2017-10-18 09:43:41 -05:00
parent cb9714bd90
commit fa49afa2a5
16 changed files with 137 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
oamapps/postConfigure/postConfigure.cpp
View File

@@ -191,7 +191,7 @@ string installDir;
string HOME = "/root";
extern string pwprompt;
string mysqlpw = " ";
string mysqlpw = oam::UnassignedName;
extern const char* pcommand;
extern string prompt;
@@ -592,11 +592,6 @@ int main(int argc, char *argv[])
{}
}
try {
oam.setSystemConfig("MySQLPasswordConfig", oam::UnassignedName);
}
catch(...) {}
//check for non-Distributed Install
if ( nonDistribute )
{
@@ -2971,7 +2966,7 @@ int main(int argc, char *argv[])
}
//check for mysql password on remote UM
if ( pwprompt == " " ) {
/* if ( pwprompt == " " ) {
//start mysqld
cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/mysql-Columnstore start'";
int rtnCode = system(cmd.c_str());
@@ -2999,8 +2994,14 @@ int main(int argc, char *argv[])
}
//get password from local tmp file
mysqlpw = getmysqlpw("/tmp/mysqlpw.log");
try {
mysqlpw = oam.getMySQLPassword();
}
catch(...)
{
mysqlpw = oam::UnassignedName;
}
if ( mysqlpw != oam::UnassignedName )
{
mysqlpw = "'" + mysqlpw + "'";
@@ -3046,7 +3047,7 @@ int main(int argc, char *argv[])
else
cout << endl << "post-mysql-install Successfully Completed" << endl;
}
}
*/ }
}
else
{ // do a binary package install
@@ -3498,14 +3499,15 @@ int main(int argc, char *argv[])
}
//set mysql replication, if wasn't setup before on system
/* if ( ( mysqlRep && pmwithum ) ||
( mysqlRep && (umNumber > 1) ) ||
( mysqlRep && (pmNumber > 1) && (IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM) ) )
// if ( ( mysqlRep && pmwithum ) ||
// ( mysqlRep && (umNumber > 1) ) ||
// ( mysqlRep && (pmNumber > 1) && (IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM) ) )
if ( mysqlRep )
{
cout << endl << "Run MariaDB ColumnStore Replication Setup.. ";
cout.flush();
//send message to procmon's to run upgrade script
//send message to procmon's to run mysql replication script
int status = sendReplicationRequest(IserverTypeInstall, password, mysqlPort, pmwithum);
if ( status != 0 ) {
@@ -3515,7 +3517,7 @@ int main(int argc, char *argv[])
else
cout << " DONE" << endl;
}
*/
cout << endl << "MariaDB ColumnStore Install Successfully Completed, System is Active" << endl << endl;
cout << "Enter the following command to define MariaDB ColumnStore Alias Commands" << endl << endl;