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

mcol-138

Browse Source
This commit is contained in:
david hill
2016-07-13 15:08:28 -05:00
parent 55858d9eb0
commit c954b34337
5 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
oamapps/columnstoreSupport/columnstoreSupport.cpp
View File

@@ -423,7 +423,7 @@ int main(int argc, char *argv[])
cout << "It should be run on the server with the DBRM front-end." << endl; cout << "It should be run on the server with the DBRM front-end." << endl;
cout << "Check the Admin Guide for additional information." << endl; cout << "Check the Admin Guide for additional information." << endl;
cout << endl; cout << endl;
cout << "Usage: columnstoreSupport [-h][-a][-hw][-s][-c][-db][-r][-l][-bl][-lc][-p 'root-password'][-mp 'mysql-root-password'][-de]"; cout << "Usage: columnstoreSupport [-h][-a][-hw][-s][-c][-db][-r][-l][-bl][-lc][-p 'root-password'][-mp 'mariadb-columnstore-root-password'][-de]";
// if hdfs set up print the hadoop option // if hdfs set up print the hadoop option
if (!DataFilePlugin.empty()) if (!DataFilePlugin.empty())
cout << "[-hd]"; cout << "[-hd]";
@@ -439,7 +439,7 @@ int main(int argc, char *argv[])
cout << " -bl Output Columnstore Bulk Log Reports only" << endl; cout << " -bl Output Columnstore Bulk Log Reports only" << endl;
cout << " -lc Output Reports for Local Server only" << endl; cout << " -lc Output Reports for Local Server only" << endl;
cout << " -p password (multi-server systems), root-password or 'ssh' to use 'ssh keys'" << endl; cout << " -p password (multi-server systems), root-password or 'ssh' to use 'ssh keys'" << endl;
cout << " -mp mysql root user password" << endl; cout << " -mp MariaDB Columnstore root user password" << endl;
cout << " -de Debug Flag" << endl; cout << " -de Debug Flag" << endl;
// if hdfs set up print the hadoop option // if hdfs set up print the hadoop option
if (!DataFilePlugin.empty()) if (!DataFilePlugin.empty())
@@ -490,7 +490,7 @@ int main(int argc, char *argv[])
else if( string("-mp") == argv[i] ) { else if( string("-mp") == argv[i] ) {
i++; i++;
if ( argc == i ) { if ( argc == i ) {
cout << "ERROR: missing mysql root user password argument" << endl; cout << "ERROR: missing MariaDB Columnstore root user password argument" << endl;
exit(-1); exit(-1);
} }
mysqlpw = argv[i]; mysqlpw = argv[i];
@@ -791,7 +791,7 @@ int main(int argc, char *argv[])
string pwprompt = " "; string pwprompt = " ";
if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") ) { if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") ) {
cout << "NOTE: MySQL root user password is set" << endl; cout << "NOTE: MariaDB Columnstore root user password is set" << endl;
//needs a password, was password entered on command line //needs a password, was password entered on command line
if ( mysqlpw == " " ) if ( mysqlpw == " " )
{ //go check my.cnf { //go check my.cnf
@@ -826,7 +826,7 @@ int main(int argc, char *argv[])
{ {
cout << "NOTE: No password provide on command line or found uncommented in my.cnf" << endl; cout << "NOTE: No password provide on command line or found uncommented in my.cnf" << endl;
cout << endl; cout << endl;
string prompt = " *** Enter MySQL password > "; string prompt = " *** Enter MariaDB Columnstore password > ";
mysqlpw = getpass(prompt.c_str()); mysqlpw = getpass(prompt.c_str());
} }
} }
@@ -838,7 +838,7 @@ int main(int argc, char *argv[])
system(cmd.c_str()); system(cmd.c_str());
if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") ) { if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") ) {
cout << "FAILED: Failed login using MySQL root user password '" << mysqlpw << "'" << endl; cout << "FAILED: Failed login using MariaDB Columnstore root user password '" << mysqlpw << "'" << endl;
FAILED = true; FAILED = true;
} }
} }
@@ -852,7 +852,7 @@ int main(int argc, char *argv[])
if ( WEXITSTATUS(ret) == 0) { if ( WEXITSTATUS(ret) == 0) {
// run DBMS report info // run DBMS report info
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
system("echo '******************** DBMS Columnstore Mysql Version ********************' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Columnstore Version ********************' >> columnstoreSupportReport.txt");
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
cmd = "echo '################# " + columnstoreMysql + " -e status ################# ' >> columnstoreSupportReport.txt"; cmd = "echo '################# " + columnstoreMysql + " -e status ################# ' >> columnstoreSupportReport.txt";
system(cmd.c_str()); system(cmd.c_str());
@@ -862,7 +862,7 @@ int main(int argc, char *argv[])
system(cmd.c_str()); system(cmd.c_str());
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
system("echo '******************** DBMS Mysql Columnstore System Column ********************' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Columnstore System Column ********************' >> columnstoreSupportReport.txt");
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
cmd = "echo '################# " + columnstoreMysql + " -e desc calpontsys.syscolumn ################# ' >> columnstoreSupportReport.txt"; cmd = "echo '################# " + columnstoreMysql + " -e desc calpontsys.syscolumn ################# ' >> columnstoreSupportReport.txt";
system(cmd.c_str()); system(cmd.c_str());
@@ -872,7 +872,7 @@ int main(int argc, char *argv[])
system(cmd.c_str()); system(cmd.c_str());
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
system("echo '******************** DBMS Mysql Columnstore System Table ********************' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Columnstore System Table ********************' >> columnstoreSupportReport.txt");
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
cmd = "echo '################# " + columnstoreMysql + " -e desc calpontsys.systable ################# ' >> columnstoreSupportReport.txt"; cmd = "echo '################# " + columnstoreMysql + " -e desc calpontsys.systable ################# ' >> columnstoreSupportReport.txt";
system(cmd.c_str()); system(cmd.c_str());
@@ -882,7 +882,7 @@ int main(int argc, char *argv[])
system(cmd.c_str()); system(cmd.c_str());
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
system("echo '******************** DBMS Mysql Columnstore System Catalog Data ********************' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Columnstore System Catalog Data ********************' >> columnstoreSupportReport.txt");
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
cmd = "echo '################# " + columnstoreMysql + " calpontsys < " + installDir + "/mysql/dumpcat_mysql.sql ################# ' >> columnstoreSupportReport.txt"; cmd = "echo '################# " + columnstoreMysql + " calpontsys < " + installDir + "/mysql/dumpcat_mysql.sql ################# ' >> columnstoreSupportReport.txt";
system(cmd.c_str()); system(cmd.c_str());
@@ -892,7 +892,7 @@ int main(int argc, char *argv[])
system(cmd.c_str()); system(cmd.c_str());
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
system("echo '******************** DBMS Mysql Columnstore System Table Data ********************' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Columnstore System Table Data ********************' >> columnstoreSupportReport.txt");
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
cmd = "echo '################# " + columnstoreMysql + " -e select * from calpontsys.systable ################# ' >> columnstoreSupportReport.txt"; cmd = "echo '################# " + columnstoreMysql + " -e select * from calpontsys.systable ################# ' >> columnstoreSupportReport.txt";
system(cmd.c_str()); system(cmd.c_str());
@@ -902,7 +902,7 @@ int main(int argc, char *argv[])
system(cmd.c_str()); system(cmd.c_str());
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
system("echo '******************** DBMS Mysql Columnstore Usernames ********************' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Columnstore Usernames ********************' >> columnstoreSupportReport.txt");
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
cmd = "echo '################# " + columnstoreMysql + " -e show databases ################# ' >> columnstoreSupportReport.txt"; cmd = "echo '################# " + columnstoreMysql + " -e show databases ################# ' >> columnstoreSupportReport.txt";
system(cmd.c_str()); system(cmd.c_str());
@@ -912,7 +912,7 @@ int main(int argc, char *argv[])
system(cmd.c_str()); system(cmd.c_str());
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
system("echo '******************** DBMS Mysql Columnstore variables ********************' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Columnstore variables ********************' >> columnstoreSupportReport.txt");
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
cmd = "echo '################# " + columnstoreMysql + " show variables ################# ' >> columnstoreSupportReport.txt"; cmd = "echo '################# " + columnstoreMysql + " show variables ################# ' >> columnstoreSupportReport.txt";
system(cmd.c_str()); system(cmd.c_str());
@@ -941,7 +941,7 @@ int main(int argc, char *argv[])
} }
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
system("echo '******************** DBMS Mysql Columnstore config file ********************' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Columnstore config file ********************' >> columnstoreSupportReport.txt");
system("echo ' ' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt");
string cmd = "echo '################# cat /mysql/my.cnf ################# ' >> columnstoreSupportReport.txt"; string cmd = "echo '################# cat /mysql/my.cnf ################# ' >> columnstoreSupportReport.txt";
system(cmd.c_str()); system(cmd.c_str());

30
oamapps/mcsadmin/mcsadmin.cpp
View File

@@ -3147,7 +3147,7 @@ int processCommand(string* arguments)
if ( MySQLRep == "y" && MySQLPasswordConfig == oam::UnassignedName ) { if ( MySQLRep == "y" && MySQLPasswordConfig == oam::UnassignedName ) {
cout << endl; cout << endl;
string prompt = "MySQL Replication is enabled, is there a 'MySQL' Password configured in " + HOME + "/.my.cnf (y,n): "; string prompt = "MariaDB Columnstore Replication is enabled, is there a 'MariaDB Columnstore' Password configured in " + HOME + "/.my.cnf (y,n): ";
MySQLPasswordConfig = dataPrompt(prompt); MySQLPasswordConfig = dataPrompt(prompt);
} }
@@ -4747,7 +4747,7 @@ int processCommand(string* arguments)
break; break;
} }
case 46: // enableMySQLReplication case 46: // enableReplication
{ {
string MySQLRep; string MySQLRep;
try { try {
@@ -4756,7 +4756,7 @@ int processCommand(string* arguments)
catch(...) {} catch(...) {}
if ( MySQLRep == "y" ) { if ( MySQLRep == "y" ) {
string warning = "MySQL Replication Feature is already enabled"; string warning = "MariaDB Columnstore Replication Feature is already enabled";
// confirm request // confirm request
if (confirmPrompt(warning)) if (confirmPrompt(warning))
break; break;
@@ -4782,7 +4782,7 @@ int processCommand(string* arguments)
if ( MySQLPasswordConfig == oam::UnassignedName ) { if ( MySQLPasswordConfig == oam::UnassignedName ) {
cout << endl; cout << endl;
string prompt = "Is there a 'MySQL' Password configured on the MySQL Front-end Modules in " + HOME + "/.my.cnf (y,n): "; string prompt = "Is there a 'MariaDB Columnstore' Password configured on the MariaDB Columnstore Front-end Modules in " + HOME + "/.my.cnf (y,n): ";
MySQLPasswordConfig = dataPrompt(prompt); MySQLPasswordConfig = dataPrompt(prompt);
} }
@@ -4804,7 +4804,7 @@ int processCommand(string* arguments)
try try
{ {
oam.enableMySQLRep(password); oam.enableMySQLRep(password);
cout << endl << " Successful Enabling of MySQL Replication " << endl << endl; cout << endl << " Successful Enabling of MariaDB Columnstore Replication " << endl << endl;
//display Primary UM Module / Master Node //display Primary UM Module / Master Node
string PrimaryUMModuleName; string PrimaryUMModuleName;
@@ -4813,11 +4813,11 @@ int processCommand(string* arguments)
} }
catch(...) {} catch(...) {}
cout << " MySQL Replication Master Node is " << PrimaryUMModuleName << endl << endl; cout << " MariaDB Columnstore Replication Master Node is " << PrimaryUMModuleName << endl << endl;
} }
catch (exception& e) catch (exception& e)
{ {
cout << endl << "**** enableMySQLRep Failed : " << e.what() << endl; cout << endl << "**** enableRep Failed : " << e.what() << endl;
} }
break; break;
} }
@@ -5715,7 +5715,7 @@ int processCommand(string* arguments)
break; break;
} }
case 51: // disableMySQLReplication case 51: // disableReplication
{ {
string MySQLRep; string MySQLRep;
try { try {
@@ -5724,7 +5724,7 @@ int processCommand(string* arguments)
catch(...) {} catch(...) {}
if ( MySQLRep == "n" ) { if ( MySQLRep == "n" ) {
string warning = "MySQL Replication Feature is already disable"; string warning = "MariaDB Columnstore Replication Feature is already disable";
// confirm request // confirm request
if (confirmPrompt(warning)) if (confirmPrompt(warning))
break; break;
@@ -5738,7 +5738,7 @@ int processCommand(string* arguments)
if ( MySQLPasswordConfig == oam::UnassignedName ) { if ( MySQLPasswordConfig == oam::UnassignedName ) {
cout << endl; cout << endl;
string prompt = "Is there a 'MySQL' Password configured on the MySQL Front-end Modules in " + HOME + "/.my.cnf (y,n): "; string prompt = "Is there a 'MariaDB Columnstore' Password configured on the MariaDB Columnstore Front-end Modules in " + HOME + "/.my.cnf (y,n): ";
MySQLPasswordConfig = dataPrompt(prompt); MySQLPasswordConfig = dataPrompt(prompt);
} }
@@ -5760,11 +5760,11 @@ int processCommand(string* arguments)
try try
{ {
oam.disableMySQLRep(); oam.disableMySQLRep();
cout << endl << " Successful Disable of MySQL Replication " << endl; cout << endl << " Successful Disable of MariaDB Columnstore Replication " << endl;
} }
catch (exception& e) catch (exception& e)
{ {
cout << endl << "**** disableMySQLRep Failed : " << e.what() << endl; cout << endl << "**** disableRep Failed : " << e.what() << endl;
} }
break; break;
@@ -7866,13 +7866,13 @@ void printSystemStatus()
if ( moduletypeconfig.ModuleCount > 1 ) if ( moduletypeconfig.ModuleCount > 1 )
{ {
if ( PrimaryUMModuleName != oam::UnassignedName ) if ( PrimaryUMModuleName != oam::UnassignedName )
cout << "Primary Front-End MySQL Module is '" << PrimaryUMModuleName << "'" << endl; cout << "Primary Front-End MariaDB Columnstore Module is '" << PrimaryUMModuleName << "'" << endl;
} }
} }
else else
{ {
if ( PrimaryUMModuleName != oam::UnassignedName ) if ( PrimaryUMModuleName != oam::UnassignedName )
cout << "Primary Front-End MySQL Module is '" << PrimaryUMModuleName << "'" << endl; cout << "Primary Front-End MariaDB Columnstore Module is '" << PrimaryUMModuleName << "'" << endl;
} }
} }
@@ -7894,7 +7894,7 @@ void printSystemStatus()
catch(...) {} catch(...) {}
if ( MySQLRep == "y" ) if ( MySQLRep == "y" )
cout << "MySQL Replication Feature is enabled" << endl << endl; cout << "MariaDB Columnstore Replication Feature is enabled" << endl << endl;
} }
catch (exception& e) catch (exception& e)
{ {

26
oamapps/postConfigure/helpers.cpp
View File

@@ -275,11 +275,11 @@ void mysqlSetup()
string mysqlpw = oam::UnassignedName; string mysqlpw = oam::UnassignedName;
try { try {
mysqlpw = oam.getMySQLPassword(false); mysqlpw = oam.getMySQLPassword(false);
cout << "NOTE: Using MySQL password from " + HOME + "/.my.cnf" << endl; cout << "NOTE: Using MariaDB Columnstore password from " + HOME + "/.my.cnf" << endl;
} }
catch (...) catch (...)
{ {
cout << endl << "MariDB Columnstore-MySQL login failure, password is assigned. Need MySQL password configuration file " + HOME + "/.my.cnf on local module" << endl; cout << endl << "MariDB Columnstore login failure, password is assigned. Need MariaDB Columnstore password configuration file " + HOME + "/.my.cnf on local module" << endl;
exit(1); exit(1);
} }
@@ -294,7 +294,7 @@ void mysqlSetup()
else else
{ {
if (!oam.checkLogStatus("/tmp/idbmysql.log", "Columnstore") ) { if (!oam.checkLogStatus("/tmp/idbmysql.log", "Columnstore") ) {
cout << endl << "ERROR: MySQL runtime error, exit..." << endl << endl; cout << endl << "ERROR: MariaDB Columnstore runtime error, exit..." << endl << endl;
system("cat /tmp/idbmysql.log"); system("cat /tmp/idbmysql.log");
exit (1); exit (1);
} }
@@ -474,7 +474,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, std::st
returnStatus = sendMsgProcMon( (*pt).DeviceName, msg1, requestID, 600 ); returnStatus = sendMsgProcMon( (*pt).DeviceName, msg1, requestID, 600 );
if ( returnStatus != API_SUCCESS) { if ( returnStatus != API_SUCCESS) {
cout << "ERROR: Error return in running the MySQL Master DB Distribute, check /tmp/master-dist.logs on " << masterModule << endl; cout << "ERROR: Error return in running the MariaDB Columnstore Master DB Distribute, check /tmp/master-dist.logs on " << masterModule << endl;
return returnStatus; return returnStatus;
} }
@@ -486,7 +486,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, std::st
returnStatus = sendMsgProcMon( (*pt).DeviceName, msg, requestID, 30 ); returnStatus = sendMsgProcMon( (*pt).DeviceName, msg, requestID, 30 );
if ( returnStatus != API_SUCCESS) { if ( returnStatus != API_SUCCESS) {
cout << "ERROR: Error return in running the MySQL Master replication, check /tmp/master-rep*.logs on " << masterModule << endl; cout << "ERROR: Error return in running the MariaDB Columnstore Master replication, check /tmp/master-rep*.logs on " << masterModule << endl;
return returnStatus; return returnStatus;
} }
@@ -517,7 +517,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, std::st
returnStatus = sendMsgProcMon( (*pt).DeviceName, msg, requestID, 30 ); returnStatus = sendMsgProcMon( (*pt).DeviceName, msg, requestID, 30 );
if ( returnStatus != API_SUCCESS) { if ( returnStatus != API_SUCCESS) {
cout << "ERROR: Error return in running the MySQL Slave replication, check /tmp/slave-rep*.logs on " << (*pt).DeviceName << endl; cout << "ERROR: Error return in running the MariaDB Columnstore Slave replication, check /tmp/slave-rep*.logs on " << (*pt).DeviceName << endl;
return returnStatus; return returnStatus;
} }
@@ -705,12 +705,12 @@ void checkMysqlPort( std::string& mysqlPort, Config* sysConfig )
int size = oldFile.tellg(); int size = oldFile.tellg();
if ( size != 0 ) { if ( size != 0 ) {
if ( noPrompting ) { if ( noPrompting ) {
cout << endl << "The mysqld port of '" + mysqlPort + "' is already in-use" << endl; cout << endl << "The MariaDB Columnstore port of '" + mysqlPort + "' is already in-use" << endl;
cout << "For No-prompt install, use the command line argument of 'port' to enter a different number" << endl; cout << "For No-prompt install, use the command line argument of 'port' to enter a different number" << endl;
exit(1); exit(1);
} }
cout << "The mysqld port of '" + mysqlPort + "' is already in-use on local server" << endl; cout << "The MariaDB Columnstore port of '" + mysqlPort + "' is already in-use on local server" << endl;
while(true) while(true)
{ {
@@ -725,7 +725,7 @@ void checkMysqlPort( std::string& mysqlPort, Config* sysConfig )
if ( atoi(mysqlPort.c_str()) < 1000 || atoi(mysqlPort.c_str()) > 9999) if ( atoi(mysqlPort.c_str()) < 1000 || atoi(mysqlPort.c_str()) > 9999)
{ {
cout << " ERROR: Invalid MySQL Port ID supplied, must be between 1000-9999" << endl; cout << " ERROR: Invalid MariaDB Columnstore Port ID supplied, must be between 1000-9999" << endl;
} }
else else
break; break;
@@ -781,7 +781,7 @@ void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string
int size = oldFile.tellg(); int size = oldFile.tellg();
if ( size != 0 ) { if ( size != 0 ) {
if ( noPrompting ) { if ( noPrompting ) {
cout << endl << "The mysqld port of '" + mysqlPort + "' is already in-use" << endl; cout << endl << "The MariaDB Columnstore port of '" + mysqlPort + "' is already in-use" << endl;
cout << "For No-prompt install, use the command line argument of 'port' to enter a different number" << endl; cout << "For No-prompt install, use the command line argument of 'port' to enter a different number" << endl;
exit(1); exit(1);
} }
@@ -812,7 +812,7 @@ void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string
int rtnCode = system(cmd.c_str()); int rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) == 0) { if (WEXITSTATUS(rtnCode) == 0) {
if ( noPrompting ) { if ( noPrompting ) {
cout << endl << "The mysqld port of '" + mysqlPort + "' is already in-use on " << remoteModuleName << endl; cout << endl << "The MariaDB Columnstore port of '" + mysqlPort + "' is already in-use on " << remoteModuleName << endl;
cout << "For No-prompt install, use the command line argument of 'port' to enter a different number" << endl; cout << "For No-prompt install, use the command line argument of 'port' to enter a different number" << endl;
cout << "exiting..." << endl; cout << "exiting..." << endl;
exit(1); exit(1);
@@ -830,7 +830,7 @@ void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string
if ( inUse ) if ( inUse )
{ {
cout << endl << "The mysqld port of '" + mysqlPort + "' is already in-use on " << inUseServer << endl; cout << endl << "The MariaDB Columnstore port of '" + mysqlPort + "' is already in-use on " << inUseServer << endl;
while(true) while(true)
{ {
@@ -845,7 +845,7 @@ void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string
if ( atoi(mysqlPort.c_str()) < 1000 || atoi(mysqlPort.c_str()) > 9999) if ( atoi(mysqlPort.c_str()) < 1000 || atoi(mysqlPort.c_str()) > 9999)
{ {
cout << " ERROR: Invalid MySQL Port ID supplied, must be between 1000-9999" << endl; cout << " ERROR: Invalid MariaDB Columnstore Port ID supplied, must be between 1000-9999" << endl;
} }
else else
break; break;

8
oamapps/postConfigure/installer.cpp
View File

@@ -758,7 +758,7 @@ int main(int argc, char *argv[])
if ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM ) if ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM )
{ {
//run the mysql / mysqld setup scripts //run the mysql / mysqld setup scripts
cout << endl << "Running the MariaDB Columnstore MySQL setup scripts" << endl << endl; cout << endl << "Running the MariaDB Columnstore setup scripts" << endl << endl;
// call the mysql setup scripts // call the mysql setup scripts
mysqlSetup(); mysqlSetup();
@@ -803,7 +803,7 @@ int main(int argc, char *argv[])
if ( calpont_rpm1 != "dummy.rpm" ) { if ( calpont_rpm1 != "dummy.rpm" ) {
//run the mysql / mysqld setup scripts //run the mysql / mysqld setup scripts
cout << endl << "Running the MariaDB Columnstore MySQL setup scripts" << endl << endl; cout << endl << "Running the MariaDB Columnstore setup scripts" << endl << endl;
// call the mysql setup scripts // call the mysql setup scripts
mysqlSetup(); mysqlSetup();
@@ -823,7 +823,7 @@ int main(int argc, char *argv[])
// //
//run the mysql / mysqld setup scripts //run the mysql / mysqld setup scripts
cout << endl << "Running the MariaDB Columnstore MySQL setup scripts" << endl << endl; cout << endl << "Running the MariaDB Columnstore setup scripts" << endl << endl;
// call the mysql setup scripts // call the mysql setup scripts
mysqlSetup(); mysqlSetup();
@@ -865,7 +865,7 @@ int main(int argc, char *argv[])
cout << ". " + installDir + "/bin/columnstoreAlias" << endl << endl; cout << ". " + installDir + "/bin/columnstoreAlias" << endl << endl;
cout << "Enter 'mcsmysql' to access the MariaDB Columnstore MySQL console" << endl; cout << "Enter 'mcsmysql' to access the MariaDB Columnstore SQL console" << endl;
cout << "Enter 'mcsadmin' to access the MariaDB Columnstore Admin console" << endl << endl; cout << "Enter 'mcsadmin' to access the MariaDB Columnstore Admin console" << endl << endl;
} }
else else

38
oamapps/postConfigure/postConfigure.cpp
View File

@@ -288,9 +288,9 @@ int main(int argc, char *argv[])
cout << " -u Upgrade, Install using the Config File from -c, default to Columnstore.xml.rpmsave" << endl; cout << " -u Upgrade, Install using the Config File from -c, default to Columnstore.xml.rpmsave" << endl;
cout << " If ssh-keys aren't setup, you should provide passwords as command line arguments" << endl; cout << " If ssh-keys aren't setup, you should provide passwords as command line arguments" << endl;
cout << " -p Unix Password, used with no-prompting option" << endl; cout << " -p Unix Password, used with no-prompting option" << endl;
cout << " -mp MySQL Password" << endl; cout << " -mp MariaDB Columnstore Password" << endl;
cout << " -s Single Threaded Remote Install" << endl; cout << " -s Single Threaded Remote Install" << endl;
cout << " -port MySQL Port Address" << endl; cout << " -port MariaDB Columnstore Port Address" << endl;
exit (0); exit (0);
} }
else if( string("-s") == argv[i] ) else if( string("-s") == argv[i] )
@@ -326,12 +326,12 @@ int main(int argc, char *argv[])
else if( string("-mp") == argv[i] ) { else if( string("-mp") == argv[i] ) {
i++; i++;
if (i >= argc ) { if (i >= argc ) {
cout << " ERROR: MySql Password not provided" << endl; cout << " ERROR: MariaDB Columnstore Password not provided" << endl;
exit (1); exit (1);
} }
mysqlpw = argv[i]; mysqlpw = argv[i];
if ( mysqlpw.find("-") != string::npos ) { if ( mysqlpw.find("-") != string::npos ) {
cout << " ERROR: Valid MySQL Password not provided" << endl; cout << " ERROR: Valid MariaDB Columnstore Password not provided" << endl;
exit (1); exit (1);
} }
if ( mysqlpw == "dummymysqlpw" ) if ( mysqlpw == "dummymysqlpw" )
@@ -357,13 +357,13 @@ int main(int argc, char *argv[])
else if( string("-port") == argv[i] ) { else if( string("-port") == argv[i] ) {
i++; i++;
if (i >= argc ) { if (i >= argc ) {
cout << " ERROR: MySQL Port ID not supplied" << endl; cout << " ERROR: MariaDB Columnstore Port ID not supplied" << endl;
exit (1); exit (1);
} }
mysqlPort = argv[i]; mysqlPort = argv[i];
if ( atoi(mysqlPort.c_str()) < 1000 || atoi(mysqlPort.c_str()) > 9999) if ( atoi(mysqlPort.c_str()) < 1000 || atoi(mysqlPort.c_str()) > 9999)
{ {
cout << " ERROR: Invalid MySQL Port ID supplied, must be between 1000-9999" << endl; cout << " ERROR: Invalid MariaDB Columnstore Port ID supplied, must be between 1000-9999" << endl;
exit (1); exit (1);
} }
} }
@@ -1045,7 +1045,7 @@ int main(int argc, char *argv[])
cout << endl << "NOTE: Local Query Feature is enabled" << endl; cout << endl << "NOTE: Local Query Feature is enabled" << endl;
if ( mysqlRep ) if ( mysqlRep )
cout << endl << "NOTE: MySQL Replication Feature is enabled" << endl; cout << endl << "NOTE: MariaDB Columnstore Replication Feature is enabled" << endl;
//Write out Updated System Configuration File //Write out Updated System Configuration File
try { try {
@@ -2735,7 +2735,7 @@ int main(int argc, char *argv[])
if ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM && pmNumber == 1) { if ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM && pmNumber == 1) {
//run the mysql / mysqld setup scripts //run the mysql / mysqld setup scripts
cout << endl << "===== Running the MariaDB Columnstore MySQL setup scripts =====" << endl << endl; cout << endl << "===== Running the MariaDB Columnstore MariaDB Columnstore setup scripts =====" << endl << endl;
checkMysqlPort(mysqlPort, sysConfig); checkMysqlPort(mysqlPort, sysConfig);
@@ -2957,7 +2957,7 @@ int main(int argc, char *argv[])
if ( ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM ) || if ( ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM ) ||
( (IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM) && pmwithum ) ) ( (IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM) && pmwithum ) )
{ {
cout << endl << "===== Running the MariaDB Columnstore MySQL setup scripts =====" << endl << endl; cout << endl << "===== Running the MariaDB Columnstore MariaDB Columnstore setup scripts =====" << endl << endl;
// call the mysql setup scripts // call the mysql setup scripts
mysqlSetup(); mysqlSetup();
@@ -3047,7 +3047,7 @@ int main(int argc, char *argv[])
cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "bin/getMySQLpw > /tmp/mysqlpw.log 2>&1"; cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "bin/getMySQLpw > /tmp/mysqlpw.log 2>&1";
rtnCode = system(cmd.c_str()); rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) != 0) { if (WEXITSTATUS(rtnCode) != 0) {
cout << endl << "MariaDB Columnstore-MySQL login failure, password is assigned. Need MySQL password configuration file " + HOME + "/.my.cnf on " << remoteModuleName << endl; cout << endl << "MariaDB Columnstore login failure, password is assigned. Need MariaDB Columnstore password configuration file " + HOME + "/.my.cnf on " << remoteModuleName << endl;
exit(1); exit(1);
} }
@@ -3063,20 +3063,20 @@ int main(int argc, char *argv[])
cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/bin/mysql --defaults-file=" + installDir + "/mysql/my.cnf -u root " + pwprompt + " -e status' 1 > /tmp/idbmysql.log 2>&1"; cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/bin/mysql --defaults-file=" + installDir + "/mysql/my.cnf -u root " + pwprompt + " -e status' 1 > /tmp/idbmysql.log 2>&1";
rtnCode = system(cmd.c_str()); rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) != 0) { if (WEXITSTATUS(rtnCode) != 0) {
cout << endl << "MariaDB Columnstore-MySQL login failure, password mismatch in " + HOME + ".my.cnf on " << remoteModuleName << endl; cout << endl << "MariaDB Columnstore login failure, password mismatch in " + HOME + ".my.cnf on " << remoteModuleName << endl;
exit(1); exit(1);
} }
} }
else else
{ {
if (!oam.checkLogStatus("/tmp/idbmysql.log", "Columnstore") ) { if (!oam.checkLogStatus("/tmp/idbmysql.log", "Columnstore") ) {
cout << endl << "ERROR: MySQL runtime error, exit..." << endl << endl; cout << endl << "ERROR: MariaDB Columnstore runtime error, exit..." << endl << endl;
system("cat /tmp/idbmysql.log"); system("cat /tmp/idbmysql.log");
exit (1); exit (1);
} }
else else
{ {
cout << endl << "Additional MySQL Installation steps Successfully Completed on '" + remoteModuleName + "'" << endl << endl; cout << endl << "Additional MariaDB Columnstore Installation steps Successfully Completed on '" + remoteModuleName + "'" << endl << endl;
cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/mysql-Columnstore stop'"; cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/mysql-Columnstore stop'";
int rtnCode = system(cmd.c_str()); int rtnCode = system(cmd.c_str());
@@ -3435,7 +3435,7 @@ int main(int argc, char *argv[])
string start = "y"; string start = "y";
cout << "System Installation is complete." << endl; cout << "System Installation is complete." << endl;
cout << "If an error occurred while running the MariaDB Columnstore MySQL setup scripts," << endl; cout << "If an error occurred while running the MariaDB Columnstore setup scripts," << endl;
cout << "this will need to be corrected and postConfigure will need to be re-run." << endl << endl; cout << "this will need to be corrected and postConfigure will need to be re-run." << endl << endl;
while(true) while(true)
{ {
@@ -3519,7 +3519,7 @@ int main(int argc, char *argv[])
( mysqlRep && (umNumber > 1) ) || ( mysqlRep && (umNumber > 1) ) ||
( mysqlRep && (pmNumber > 1) && (IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM) ) ) ( mysqlRep && (pmNumber > 1) && (IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM) ) )
{ {
cout << endl << "Run MySQL Replication Setup.. "; cout << endl << "Run MariaDB Columnstore Replication Setup.. ";
cout.flush(); cout.flush();
//send message to procmon's to run upgrade script //send message to procmon's to run upgrade script
@@ -3539,7 +3539,7 @@ int main(int argc, char *argv[])
cout << ". " + installDir + "/bin/columnstoreAlias" << endl << endl; cout << ". " + installDir + "/bin/columnstoreAlias" << endl << endl;
cout << "Enter 'mcsmysql' to access the MariaDB Columnstore MySQL console" << endl; cout << "Enter 'mcsmysql' to access the MariaDB Columnstore SQL console" << endl;
cout << "Enter 'mcsadmin' to access the MariaDB Columnstore Admin console" << endl << endl; cout << "Enter 'mcsadmin' to access the MariaDB Columnstore Admin console" << endl << endl;
} }
else else
@@ -4318,11 +4318,11 @@ bool storageSetup(bool amazonInstall)
// get Frontend Data storage type // get Frontend Data storage type
// //
cout << "----- Setup User Module MySQL Data Storage Mount Configuration -----" << endl << endl; cout << "----- Setup User Module MariaDB Columnstore Data Storage Mount Configuration -----" << endl << endl;
cout << "There are 2 options when configuring the storage: internal and external" << endl << endl; cout << "There are 2 options when configuring the storage: internal and external" << endl << endl;
cout << " 'internal' - This is specified when a local disk is used for the MySQL Data storage." << endl << endl; cout << " 'internal' - This is specified when a local disk is used for the Data storage." << endl << endl;
cout << " 'external' - This is specified when the MySQL Data directory is externally mounted." << endl << endl; cout << " 'external' - This is specified when the MariaDB Columnstore Data directory is externally mounted." << endl << endl;
try { try {
UMStorageType = sysConfig->getConfig(InstallSection, "UMStorageType"); UMStorageType = sysConfig->getConfig(InstallSection, "UMStorageType");