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

more fixes

Browse Source
This commit is contained in:
david hill
2016-05-13 16:35:11 -05:00
parent 3e46a8e9ce
commit 46b371b8d2
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/releasenum
View File

@@ -1,5 +1,5 @@
#
version=10.0
release=1
release=0

2
oam/install_scripts/columnstoreAlias
View File

@@ -3,7 +3,7 @@
alias mcsmysql='/usr/local/MariaDB/Columnstore/mysql/bin/mysql --defaults-file=/usr/local/MariaDB/Columnstore/mysql/my.cnf -u root'
alias ma=/usr/local/MariaDB/Columnstore/bin/mcsadmin
alias mcsadmin=/usr/local/MariaDB/Columnstore/bin/mcsadmin
alias home='cd /usr/local/MaridDB/Columnstore'
alias home='cd /usr/local/MariadDB/Columnstore'
alias log='cd /var/log/Columnstore/'
alias core='cd /var/log/Columnstore/corefiles'
alias tmsg='tail -f /var/log/messages'

4
oamapps/columnstoreSupport/columnstoreSupport.cpp
View File

@@ -301,11 +301,11 @@ void reportThread(string reporttype)
system(cmd.c_str());
cmd = "echo ' ' >> " + outputFile;
system(cmd.c_str());
cmd = "echo '################# cat /etc/MariaDB/Columnstore.xml ################# ' >> " + outputFile;
cmd = "echo '################# cat /etc/Calpont.xml ################# ' >> " + outputFile;
system(cmd.c_str());
cmd = "echo ' ' >> " + outputFile;
system(cmd.c_str());
cmd = "cat " + installDir + "/etc/MariaDB/Columnstore.xml >> " + outputFile;
cmd = "cat " + installDir + "/etc/Calpont.xml >> " + outputFile;
system(cmd.c_str());
}

68
oamapps/postConfigure/installer.cpp
View File

@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
}
catch(...)
{
cout << "ERROR: Problem getting ServerTypeInstall from the Calpont System Configuration file" << endl;
cout << "ERROR: Problem getting ServerTypeInstall from the MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
IserverTypeInstall = atoi(serverTypeInstall.c_str());
@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
case (oam::INSTALL_COMBINE_DM_UM_PM): // combined #1 - dm/um/pm on a single server
{
if ( !writeConfig(sysConfig) ) {
cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl;
cout << "ERROR: Failed trying to update MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
}
catch(...)
{
cout << "ERROR: Problem setting RotatingDestination in the Calpont System Configuration file" << endl;
cout << "ERROR: Problem setting RotatingDestination in the MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
@@ -213,7 +213,7 @@ int main(int argc, char *argv[])
}
catch(...)
{
cout << "ERROR: Problem getting DB Storage Data from the InfiniDB System Configuration file" << endl;
cout << "ERROR: Problem getting DB Storage Data from the MariaDB Columnstore System Configuration file" << endl;
return false;
}
@@ -228,7 +228,7 @@ int main(int argc, char *argv[])
}
catch(...)
{
cout << "ERROR: Problem setting NumBlocksPct in the InfiniDB System Configuration file" << endl;
cout << "ERROR: Problem setting NumBlocksPct in the MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
@@ -284,7 +284,7 @@ int main(int argc, char *argv[])
}
catch(...)
{
cout << "ERROR: Problem setting TotalUmMemory in the InfiniDB System Configuration file" << endl;
cout << "ERROR: Problem setting TotalUmMemory in the MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
}
@@ -304,7 +304,7 @@ int main(int argc, char *argv[])
}
catch(...)
{
cout << "ERROR: Problem setting NumBlocksPct in the InfiniDB System Configuration file" << endl;
cout << "ERROR: Problem setting NumBlocksPct in the MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
}
@@ -315,13 +315,13 @@ int main(int argc, char *argv[])
}
catch(...)
{
cout << "ERROR: Problem reading NumBlocksPct/TotalUmMemory in the InfiniDB System Configuration file" << endl;
cout << "ERROR: Problem reading NumBlocksPct/TotalUmMemory in the MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
}
if ( !writeConfig(sysConfig) ) {
cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl;
cout << "ERROR: Failed trying to update MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
@@ -367,7 +367,7 @@ int main(int argc, char *argv[])
}
catch(...)
{
cout << "ERROR: Problem setting TotalUmMemory in the InfiniDB System Configuration file" << endl;
cout << "ERROR: Problem setting TotalUmMemory in the MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
}
@@ -386,13 +386,13 @@ int main(int argc, char *argv[])
}
catch(...)
{
cout << "ERROR: Problem reading NumBlocksPct/TotalUmMemory in the InfiniDB System Configuration file" << endl;
cout << "ERROR: Problem reading NumBlocksPct/TotalUmMemory in the MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
}
if ( !writeConfig(sysConfig) ) {
cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl;
cout << "ERROR: Failed trying to update MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
@@ -402,7 +402,7 @@ int main(int argc, char *argv[])
}
if ( !writeConfig(sysConfig) ) {
cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl;
cout << "ERROR: Failed trying to update MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
@@ -458,7 +458,7 @@ int main(int argc, char *argv[])
}
catch(...)
{
cout << "ERROR: Problem getting NMSIPAddress from Calpont System Configuration file" << endl;
cout << "ERROR: Problem getting NMSIPAddress from MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
}
@@ -472,7 +472,7 @@ int main(int argc, char *argv[])
}
catch(...)
{
cout << "ERROR: Problem reading the Calpont System Configuration file" << endl;
cout << "ERROR: Problem reading the MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
@@ -757,17 +757,17 @@ int main(int argc, char *argv[])
if ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM )
{
//run the mysql / mysqld setup scripts
cout << endl << "Running the InfiniDB MySQL setup scripts" << endl << endl;
cout << endl << "Running the MariaDB Columnstore MySQL setup scripts" << endl << endl;
// call the mysql setup scripts
mysqlSetup();
sleep(5);
}
cout << "System Install successfully completed, starting InfiniDB" << endl;
cout << "System Install successfully completed, starting MariaDB Columnstore" << endl;
//
// perform start of InfiniDB of other servers in the system
// perform start of MariaDB Columnstore of other servers in the system
//
list1 = childmodulelist.begin();
@@ -790,9 +790,9 @@ int main(int argc, char *argv[])
//start on local module
int rtnCode = system(idbstartcmd.c_str());
if (rtnCode != 0)
cout << "Error starting InfiniDB local module" << endl;
cout << "Error starting MariaDB Columnstore local module" << endl;
else
cout << "Start InfiniDB request successful" << endl;
cout << "Start MariaDB Columnstore request successful" << endl;
}
else
{
@@ -802,7 +802,7 @@ int main(int argc, char *argv[])
if ( calpont_rpm1 != "dummy.rpm" ) {
//run the mysql / mysqld setup scripts
cout << endl << "Running the InfiniDB MySQL setup scripts" << endl << endl;
cout << endl << "Running the MariaDB Columnstore MySQL setup scripts" << endl << endl;
// call the mysql setup scripts
mysqlSetup();
@@ -811,9 +811,9 @@ int main(int argc, char *argv[])
//start on local module
int rtnCode = system(idbstartcmd.c_str());
if (WEXITSTATUS(rtnCode) != 0)
cout << "Error starting InfiniDB local module" << endl;
cout << "Error starting MariaDB Columnstore local module" << endl;
else
cout << "Start InfiniDB request successful" << endl;
cout << "Start MariaDB Columnstore request successful" << endl;
}
else
{
@@ -838,7 +838,7 @@ int main(int argc, char *argv[])
// check for system going ACTIVE
sleep(5);
cout << endl << "InfiniDB Database Platform Starting, please wait .";
cout << endl << "MariaDB Columnstore Database Platform Starting, please wait .";
cout.flush();
if ( waitForActive() ) {
@@ -862,7 +862,7 @@ int main(int argc, char *argv[])
if ( status != 0 ) {
cout << "ERROR: Error return in running the upgrade script, check /tmp/upgrade.log" << endl;
cout << endl << "InfiniDB Install Failed" << endl << endl;
cout << endl << "MariaDB Columnstore Install Failed" << endl << endl;
exit(1);
}
else
@@ -876,19 +876,19 @@ int main(int argc, char *argv[])
}
}
cout << endl << "InfiniDB Install Successfully Completed, System is Active" << endl << endl;
cout << endl << "MariaDB Columnstore Install Successfully Completed, System is Active" << endl << endl;
cout << "Enter the following command to define InfiniDB Alias Commands" << endl << endl;
cout << "Enter the following command to define MariaDB Columnstore Alias Commands" << endl << endl;
cout << ". " + installDir + "/bin/calpontAlias" << endl << endl;
cout << "Enter 'idbmysql' to access the InfiniDB MySQL console" << endl;
cout << "Enter 'cc' to access the InfiniDB OAM console" << endl << endl;
cout << "Enter 'mcsmysql' to access the MariaDB Columnstore MySQL console" << endl;
cout << "Enter 'mcsadmin' to access the MariaDB Columnstore Admin console" << endl << endl;
}
else
{
cout << " FAILED" << endl;
cout << endl << "ERROR: InfiniDB Process failed to start, check log files in /var/log/Columnstore" << endl;
cout << endl << "ERROR: MariaDB Columnstore Process failed to start, check log files in /var/log/Columnstore" << endl;
}
}
@@ -1130,7 +1130,7 @@ bool makeRClocal(string moduleName, int IserverTypeInstall)
mount1 = "/mnt\\/tmp/";
else
if ( moduleType == "pm" )
mount1 = "/Calpont\\/data/";
mount1 = "/MariaDB/Columnstore\\/data/";
else
return true;
break;
@@ -1139,7 +1139,7 @@ bool makeRClocal(string moduleName, int IserverTypeInstall)
{
if ( moduleType == "pm" ) {
mount1 = "/mnt\\/tmp/";
mount2 = "/Calpont\\/data/";
mount2 = "/MariaDB/Columnstore\\/data/";
}
else
return true;
@@ -1151,7 +1151,7 @@ bool makeRClocal(string moduleName, int IserverTypeInstall)
mount1 = "/mnt\\/tmp/";
else
if ( moduleType == "pm" )
mount1 = "/Calpont\\/data/";
mount1 = "/MariaDB/Columnstore\\/data/";
else
return true;
break;
@@ -1160,7 +1160,7 @@ bool makeRClocal(string moduleName, int IserverTypeInstall)
{
if ( moduleType == "pm" ) {
mount1 = "/mnt\\/tmp/";
mount2 = "/Calpont\\/data/";
mount2 = "/MariaDB/Columnstore\\/data/";
}
else
return true;