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

MCOL-520

Browse Source
This commit is contained in:
David Hill
2018-09-25 13:35:06 -05:00
parent df77de334d
commit 9cfe199154
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dbcon/execplan/sessionmonitor.h
View File

@ -58,7 +58,6 @@ namespace execplan
* SessionMonitor/SharedMemoryTmpFile: the file to store the shared memory segment
* data in. This needs to be a different file than
* file used for the SessionManager/SharedMemoryTmpFile.
* The default is /tmp/CalpontMonShm.
*/
/*

3
ddlproc/ddlproc.cpp
View File

@ -79,9 +79,6 @@ void setupCwd()
workdir = ".";
(void)chdir(workdir.c_str());
if (access(".", W_OK) != 0)
(void)chdir("/tmp");
}
void added_a_pm(int)

3
exemgr/main.cpp
View File

@ -1324,9 +1324,6 @@ void setupCwd(ResourceManager* rm)
{
string workdir = startup::StartUp::tmpDir();
(void)chdir(workdir.c_str());
if (access(".", W_OK) != 0)
(void)chdir("/tmp");
}
void startRssMon(size_t maxPct, int pauseSeconds)

13
oamapps/postConfigure/installer.cpp
View File

@ -56,6 +56,8 @@ using namespace config;
#include "helpers.h"
using namespace installer;
#include "installdir.h"
typedef struct Module_struct
{
std::string moduleName;
@ -170,6 +172,8 @@ int main(int argc, char* argv[])
if (p && *p)
USER = p;
string tmpDir = startup::StartUp::tmpDir();
// setup to start on reboot, for non-root amazon installs
if ( !rootUser )
{
@ -882,17 +886,18 @@ int main(int argc, char* argv[])
{
cout << " DONE" << endl;
cmd = installDir + "/bin/dbbuilder 7 > /tmp/dbbuilder.log";
string logFile = tmpDir + "/dbbuilder.log";
cmd = installDir + "/bin/dbbuilder 7 > " + logFile;
system(cmd.c_str());
if (oam.checkLogStatus("/tmp/dbbuilder.log", "System Catalog created") )
if (oam.checkLogStatus(logFile, "System Catalog created") )
cout << endl << "System Catalog Successfull Created" << endl;
else
{
if ( !oam.checkLogStatus("/tmp/dbbuilder.log", "System catalog appears to exist") )
if ( !oam.checkLogStatus(logFile, "System catalog appears to exist") )
{
cout << endl << "System Catalog Create Failure" << endl;
cout << "Check latest log file in /tmp/dbbuilder.log.*" << endl;
cout << "Check latest log file in " << logFile" << endl;
cout << " IMPORTANT: Once issue has been resolved, rerun postConfigure" << endl << endl;
exit (1);
}

12
oamapps/resourceMonitor/hardwareMonitor.cpp
View File

@ -34,6 +34,8 @@
#include "loggingid.h"
#include "alarmmanager.h"
#include "installdir.h"
using namespace std;
using namespace oam;
using namespace alarmmanager;
@ -81,10 +83,14 @@ int main (int argc, char** argv)
string highFatal;
char* p;
string tmpDir = startup::StartUp::tmpDir();
// loop forever reading the hardware status
while (TRUE)
{
int returnCode = system("ipmitool sensor list > /tmp/harwareMonitor.txt");
string logFile = tmpDir + "/harwareMonitor.txt";
string cmd = "ipmitool sensor list > " + logFile;
int returnCode = system(cmd.c_str());
if (returnCode)
{
@ -95,12 +101,12 @@ int main (int argc, char** argv)
// parse output file
ifstream File ("/tmp/harwareMonitor.txt");
ifstream File (logFile);
if (!File)
{
// System error
cout << "Error opening /tmp/harwareMonitor.txt!!!" << endl;
cout << "Error opening " << logFile << endl;
exit(-1);
}