database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00
Code Activity

MCOL-520 - fix non-root supportReport issues

Browse Source
This commit is contained in:
David Hill
2018-11-03 18:43:19 -05:00
parent cf181bb39a
commit 0193cbf91d
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
oamapps/columnstoreSupport/columnstoreSupport.cpp
View File

@@ -58,6 +58,7 @@ string rootPassword = "";
string debug_flag = "0"; string debug_flag = "0";
string mysqlpw = " "; string mysqlpw = " ";
string tmpDir; string tmpDir;
string ProfileFile;
int runningThreads = 0; int runningThreads = 0;
pthread_mutex_t mutex1 = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t mutex1 = PTHREAD_MUTEX_INITIALIZER;
@@ -130,9 +131,10 @@ void childReportThread(threadInfo_t& st)
cout.flush(); cout.flush();
string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + rootPassword + " '" + string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + rootPassword + " '. " + ProfileFile + ";" +
installDir + "/bin/" + reportType + "Report.sh " + remoteModuleName + " " + installDir + installDir + "/bin/" + reportType + "Report.sh " + remoteModuleName + " " + installDir +
"' " + debug_flag + " - forcetty"; "' " + debug_flag + " - forcetty";
int rtnCode = system(cmd.c_str()); int rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) != 0) if (WEXITSTATUS(rtnCode) != 0)
@@ -670,6 +672,17 @@ int main(int argc, char* argv[])
exit(-1); exit(-1);
} }
//Get Profile file
try
{
ProfileFile = sysConfig->getConfig(InstallSection, "ProfileFile");
}
catch (...)
{
cout << "ERROR: Problem getting ProfileFile" << endl;
exit(-1);
}
string ModuleSection = "SystemModuleConfig"; string ModuleSection = "SystemModuleConfig";
for ( unsigned int i = 0 ; i < sysModuleTypeConfig.moduletypeconfig.size(); i++) for ( unsigned int i = 0 ; i < sysModuleTypeConfig.moduletypeconfig.size(); i++)