From 70a2ca00f63a55d421769eff64ae176dbb0732b0 Mon Sep 17 00:00:00 2001
From: david hill <david.hill@mariadb.com>
Date: Wed, 25 May 2016 14:08:04 -0500
Subject: [PATCH] change tmp storage name

---
 oam/etc/Calpont.xml                     | 2 +-
 oam/etc/Calpont.xml.singleserver        | 2 +-
 oamapps/serverMonitor/cpuMonitor.cpp    | 8 ++++----
 oamapps/serverMonitor/memoryMonitor.cpp | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/oam/etc/Calpont.xml b/oam/etc/Calpont.xml
index 2088fd747..b1d9958ad 100755
--- a/oam/etc/Calpont.xml
+++ b/oam/etc/Calpont.xml
@@ -251,7 +251,7 @@
 		<NMSIPAddress>0.0.0.0</NMSIPAddress>
 		<TempSaveSize>128M</TempSaveSize> <!-- default SWSDL max element save size -->
 		<WaitPeriod>10</WaitPeriod> <!-- in seconds -->
-		<TempFileDir>/tmp/infinidb_tmp_files</TempFileDir>
+		<TempFileDir>/tmp/columnstore_tmp_files</TempFileDir>
 		<CalpontHome>$INSTALLDIR</CalpontHome>
 		<ProcessRestartCount>10</ProcessRestartCount>
 		<ProcessRestartPeriod>120</ProcessRestartPeriod>
diff --git a/oam/etc/Calpont.xml.singleserver b/oam/etc/Calpont.xml.singleserver
index 82261c80a..65895bf22 100644
--- a/oam/etc/Calpont.xml.singleserver
+++ b/oam/etc/Calpont.xml.singleserver
@@ -236,7 +236,7 @@
 		<NMSIPAddress>0.0.0.0</NMSIPAddress>
 		<TempSaveSize>128M</TempSaveSize> <!-- default SWSDL max element save size -->
 		<WaitPeriod>10</WaitPeriod> <!-- in seconds -->
-		<TempFileDir>/tmp/infinidb_tmp_files</TempFileDir>
+		<TempFileDir>/tmp/columnstore_tmp_files</TempFileDir>
 		<CalpontHome>$INSTALLDIR</CalpontHome>
 		<ModuleHeartbeatPeriod>10</ModuleHeartbeatPeriod>
 		<ModuleHeartbeatCount>3</ModuleHeartbeatCount>
diff --git a/oamapps/serverMonitor/cpuMonitor.cpp b/oamapps/serverMonitor/cpuMonitor.cpp
index cab683b9c..95d17e19e 100644
--- a/oamapps/serverMonitor/cpuMonitor.cpp
+++ b/oamapps/serverMonitor/cpuMonitor.cpp
@@ -479,9 +479,9 @@ void ServerMonitor::getCPUdata()
 {
 	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
 	int i = 0;
@@ -503,9 +503,9 @@ void ServerMonitor::getCPUdata()
 	//
 	// 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;
 	// skip first line in file, and average the next 5 entries which contains idle times
diff --git a/oamapps/serverMonitor/memoryMonitor.cpp b/oamapps/serverMonitor/memoryMonitor.cpp
index 95877d03e..5b5d8d31f 100644
--- a/oamapps/serverMonitor/memoryMonitor.cpp
+++ b/oamapps/serverMonitor/memoryMonitor.cpp
@@ -427,9 +427,9 @@ void ServerMonitor::outputProcMemory(bool log)
 	// 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;
 	long long memory;