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

change tmp storage name

Browse Source
This commit is contained in:
david hill
2016-05-25 14:08:04 -05:00
parent 5440f1fa02
commit 70a2ca00f6
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oam/etc/Calpont.xml
View File

@@ -251,7 +251,7 @@
<NMSIPAddress>0.0.0.0</NMSIPAddress> <NMSIPAddress>0.0.0.0</NMSIPAddress>
<TempSaveSize>128M</TempSaveSize> <!-- default SWSDL max element save size --> <TempSaveSize>128M</TempSaveSize> <!-- default SWSDL max element save size -->
<WaitPeriod>10</WaitPeriod> <!-- in seconds --> <WaitPeriod>10</WaitPeriod> <!-- in seconds -->
<TempFileDir>/tmp/infinidb_tmp_files</TempFileDir> <TempFileDir>/tmp/columnstore_tmp_files</TempFileDir>
<CalpontHome>$INSTALLDIR</CalpontHome> <CalpontHome>$INSTALLDIR</CalpontHome>
<ProcessRestartCount>10</ProcessRestartCount> <ProcessRestartCount>10</ProcessRestartCount>
<ProcessRestartPeriod>120</ProcessRestartPeriod> <ProcessRestartPeriod>120</ProcessRestartPeriod>

2
oam/etc/Calpont.xml.singleserver
View File

@@ -236,7 +236,7 @@
<NMSIPAddress>0.0.0.0</NMSIPAddress> <NMSIPAddress>0.0.0.0</NMSIPAddress>
<TempSaveSize>128M</TempSaveSize> <!-- default SWSDL max element save size --> <TempSaveSize>128M</TempSaveSize> <!-- default SWSDL max element save size -->
<WaitPeriod>10</WaitPeriod> <!-- in seconds --> <WaitPeriod>10</WaitPeriod> <!-- in seconds -->
<TempFileDir>/tmp/infinidb_tmp_files</TempFileDir> <TempFileDir>/tmp/columnstore_tmp_files</TempFileDir>
<CalpontHome>$INSTALLDIR</CalpontHome> <CalpontHome>$INSTALLDIR</CalpontHome>
<ModuleHeartbeatPeriod>10</ModuleHeartbeatPeriod> <ModuleHeartbeatPeriod>10</ModuleHeartbeatPeriod>
<ModuleHeartbeatCount>3</ModuleHeartbeatCount> <ModuleHeartbeatCount>3</ModuleHeartbeatCount>

8
oamapps/serverMonitor/cpuMonitor.cpp
View File

@@ -479,9 +479,9 @@ void ServerMonitor::getCPUdata()
{ {
pcl.clear(); pcl.clear();
system("top -b -n1 | head -12 | awk '{print $9,$12}' | tail -5 > /tmp/infinidb_tmp_files/processCpu"); system("top -b -n1 | head -12 | awk '{print $9,$12}' | tail -5 > /tmp/columnstore_tmp_files/processCpu");
ifstream oldFile1 ("/tmp/infinidb_tmp_files/processCpu"); ifstream oldFile1 ("/tmp/columnstore_tmp_files/processCpu");
// read top 5 users // read top 5 users
int i = 0; int i = 0;
@@ -503,9 +503,9 @@ void ServerMonitor::getCPUdata()
// //
// get and check Total CPU usage // get and check Total CPU usage
// //
system("top -b -n 6 -d 1 | awk '{print $5}' | grep %id > /tmp/infinidb_tmp_files/systemCpu"); system("top -b -n 6 -d 1 | awk '{print $5}' | grep %id > /tmp/columnstore_tmp_files/systemCpu");
ifstream oldFile ("/tmp/infinidb_tmp_files/systemCpu"); ifstream oldFile ("/tmp/columnstore_tmp_files/systemCpu");
float systemIdle = 0; float systemIdle = 0;
// skip first line in file, and average the next 5 entries which contains idle times // skip first line in file, and average the next 5 entries which contains idle times

4
oamapps/serverMonitor/memoryMonitor.cpp
View File

@@ -427,9 +427,9 @@ void ServerMonitor::outputProcMemory(bool log)
// get top 5 Memory users by process // get top 5 Memory users by process
// //
system("ps -e -orss=1,args= | sort -b -k1,1n |tail -n 5 | awk '{print $1,$2}' > /tmp/infinidb_tmp_files/processMem"); system("ps -e -orss=1,args= | sort -b -k1,1n |tail -n 5 | awk '{print $1,$2}' > /tmp/columnstore_tmp_files/processMem");
ifstream oldFile ("/tmp/infinidb_tmp_files/processMem"); ifstream oldFile ("/tmp/columnstore_tmp_files/processMem");
string process; string process;
long long memory; long long memory;