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

MCOL-520

Browse Source
This commit is contained in:
David Hill
2018-09-24 14:20:17 -05:00
parent 681cfd34eb
commit 148eb6bf58
19 changed files with 112 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
oamapps/columnstoreSupport/columnstoreSupport.cpp
View File

@@ -57,6 +57,7 @@ ChildModule childmodule;
string rootPassword = "";
string debug_flag = "0";
string mysqlpw = " ";
string tmpDir;
int runningThreads = 0;
pthread_mutex_t mutex1 = PTHREAD_MUTEX_INITIALIZER;
@@ -139,11 +140,11 @@ void childReportThread(threadInfo_t& st)
cout << "Error with running remote_command.sh, exiting..." << endl;
}
cmd = installDir + "/bin/remote_scp_get.sh " + remoteModuleIP + " " + rootPassword + " /tmp/" + outputFile + " > /dev/null 2>&1";
cmd = installDir + "/bin/remote_scp_get.sh " + remoteModuleIP + " " + rootPassword + " " + tmpDir + "/" + outputFile + " > /dev/null 2>&1";
rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) != 0)
cout << "ERROR: failed to retrieve /tmp/" << outputFile << " from " + remoteHostName << endl;
cout << "ERROR: failed to retrieve " << tmpDir << "/" << outputFile << " from " + remoteHostName << endl;
pthread_mutex_lock( &mutex1 );
runningThreads--;
@@ -198,7 +199,7 @@ void reportThread(string reporttype)
string cmd = installDir + "/bin/logReport.sh " + localModule + " " + installDir;
system(cmd.c_str());
cmd = "mv -f /tmp/" + localModule + "_logReport.tar.gz .";
cmd = "mv -f " + tmpDir + "/" + localModule + "_logReport.tar.gz .";
system(cmd.c_str());
cmd = "tar -zcf " + localModule + "_mysqllogReport.tar.gz " + installDir + "/mysql/db/*.err* 2>/dev/null";
@@ -234,7 +235,7 @@ void reportThread(string reporttype)
cmd = installDir + "/bin/" + reportType + "Report.sh " + localModule + " " + installDir;
system(cmd.c_str());
cmd = " mv -f /tmp/" + localModule + "_" + reportType + "Report.txt .";
cmd = " mv -f " + tmpDir + "/" + localModule + "_" + reportType + "Report.txt .";
system(cmd.c_str());
if (reportType == "config" )
@@ -431,6 +432,8 @@ int main(int argc, char* argv[])
cout << "ERROR: Problem accessing Columnstore configuration file" << endl;
exit(-1);
}
tmpDir = startup::StartUp::tmpDir();
for ( int i = 1; i < argc; i++ )
{
@@ -842,14 +845,15 @@ int main(int argc, char* argv[])
else
{
// check if mysql is supported and get info
string logFile = tmpDir + "/idbmysql.log";
string columnstoreMysql = installDir + "/mysql/bin/mysql --defaults-extra-file=" + installDir + "/mysql/my.cnf -u root ";
string cmd = columnstoreMysql + " -e 'status' > /tmp/idbmysql.log 2>&1";
string cmd = columnstoreMysql + " -e 'status' > " + logFile + " 2>&1";
system(cmd.c_str());
//check for mysql password set
string pwprompt = " ";
if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") )
if (oam.checkLogStatus(logFile, "ERROR 1045") )
{
cout << "NOTE: MariaDB Columnstore root user password is set" << endl;
@@ -903,10 +907,10 @@ int main(int argc, char* argv[])
//check for mysql password set
pwprompt = "--password=" + mysqlpw;
string cmd = columnstoreMysql + pwprompt + " -e 'status' > /tmp/idbmysql.log 2>&1";
string cmd = columnstoreMysql + pwprompt + " -e 'status' > " + logFile + " 2>&1";
system(cmd.c_str());
if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") )
if (oam.checkLogStatus(logFile, "ERROR 1045") )
{
cout << "FAILED: Failed login using MariaDB Columnstore root user password '" << mysqlpw << "'" << endl;
FAILED = true;
@@ -1048,7 +1052,7 @@ int main(int argc, char* argv[])
{
cout << "Get hadoop report data" << endl;
string cmd = installDir + "/bin/hadoopReport.sh " + localModule + " " + installDir + "\n";
cmd += " mv -f /tmp/hadoopReport.txt .";
cmd += " mv -f " + tmpDir + "/hadoopReport.txt .";
FILE* pipe = popen(cmd.c_str(), "r");
if (!pipe)