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

MCOL-304 - improved non-distribute comments

Browse Source
This commit is contained in:
david hill
2017-05-25 10:54:20 -05:00
parent 16f22c2c70
commit c92b1d6471
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
oamapps/postConfigure/postConfigure.cpp
View File

@@ -1021,6 +1021,9 @@ int main(int argc, char *argv[])
if ( mysqlRep ) if ( mysqlRep )
cout << endl << "NOTE: MariaDB ColumnStore Replication Feature is enabled" << endl; cout << endl << "NOTE: MariaDB ColumnStore Replication Feature is enabled" << endl;
if ( nonDistribute )
cout << endl << "NOTE: MariaDB ColumnStore Non-Distributed Install Feature is enabled" << endl;
//Write out Updated System Configuration File //Write out Updated System Configuration File
try { try {
sysConfig->setConfig(InstallSection, "InitialInstallFlag", "n"); sysConfig->setConfig(InstallSection, "InitialInstallFlag", "n");
@@ -2901,7 +2904,10 @@ int main(int argc, char *argv[])
string logfile; string logfile;
if ( remote_installer_debug == "1" ) { if ( remote_installer_debug == "1" ) {
logfile = "/tmp/"; logfile = "/tmp/";
logfile += remoteModuleName + "_" + EEPackageType + "_install.log"; if ( nonDistribute )
logfile += remoteModuleName + "_nondistributed_install.log";
else
logfile += remoteModuleName + "_" + EEPackageType + "_install.log";
debug_logfile = " > " + logfile; debug_logfile = " > " + logfile;
} }
@@ -2911,7 +2917,7 @@ int main(int argc, char *argv[])
{ {
if ( nonDistribute ) if ( nonDistribute )
{ {
cout << endl << "----- Performing Install Check on '" + remoteModuleName + " / " + remoteHostName + "' -----" << endl << endl; cout << endl << "----- Performing Non-Distrubuted Install on '" + remoteModuleName + " / " + remoteHostName + "' -----" << endl << endl;
//check of post-install file exist, which shows package is installed //check of post-install file exist, which shows package is installed
string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " 'ls " + installDir + "/bin/post-install' > /tmp/install_check.log"; string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " 'ls " + installDir + "/bin/post-install' > /tmp/install_check.log";
@@ -3090,7 +3096,7 @@ int main(int argc, char *argv[])
{ {
if ( nonDistribute ) if ( nonDistribute )
{ {
cout << endl << "----- Performing Install Check on '" + remoteModuleName + " / " + remoteHostName + "' -----" << endl << endl; cout << endl << "----- Performing Non-Distrubuted Install on '" + remoteModuleName + " / " + remoteHostName + "' -----" << endl << endl;
//check of releasenum file exist, which shows package is installed //check of releasenum file exist, which shows package is installed
string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " 'ls " + installDir + "/bin/post-install' > /tmp/install_check.log"; string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " 'ls " + installDir + "/bin/post-install' > /tmp/install_check.log";
@@ -3100,8 +3106,23 @@ int main(int argc, char *argv[])
cout << "Install and re-run postConfigure. Exiting..." << endl << endl; cout << "Install and re-run postConfigure. Exiting..." << endl << endl;
exit(1); exit(1);
} }
//check version that is installed
cmd = installDir + "/bin/remote_scp_get.sh " + remoteModuleIP + " " + password + " " + installDir + "/releasenum > /dev/null 2>&1";
rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) != 0) {
cout << "Error: MariaDB ColumnStore not installed on " + remoteModuleName + " / " + remoteHostName << endl;
cout << "Install and re-run postConfigure. Exiting..." << endl << endl;
exit(1);
}
cmd = "diff " + installDir + "/releasenum releasenum > /dev/null 2>&1";
rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) != 0) {
cout << "Error: Local version of MariaDB ColumnStore doesn't match installed version on " + remoteModuleName + " / " + remoteHostName << endl;
cout << "Install matching version and re-run postConfigure. Exiting..." << endl << endl;
exit(1);
}
} }
else else
cout << endl << "----- Performing Install on '" + remoteModuleName + " / " + remoteHostName + "' -----" << endl << endl; cout << endl << "----- Performing Install on '" + remoteModuleName + " / " + remoteHostName + "' -----" << endl << endl;
if ( remote_installer_debug == "1" ) if ( remote_installer_debug == "1" )