From e70c9479775ee7c940cb08eb0506ec0d39694d85 Mon Sep 17 00:00:00 2001
From: david hill <david.hill@mariadb.com>
Date: Thu, 24 May 2018 10:33:46 -0500
Subject: [PATCH] change to use local lock file directory for nonroot

---
 dbcon/mysql/mysql-Columnstore        | 11 ++---------
 oam/etc/Columnstore.xml              |  1 +
 oam/etc/Columnstore.xml.singleserver |  1 +
 oam/install_scripts/columnstore      | 12 +-----------
 oam/install_scripts/post-install     | 14 ++++++++++++++
 oam/install_scripts/pre-uninstall    |  5 ++++-
 oam/oamcpp/liboamcpp.cpp             | 12 +++++++++++-
 tools/configMgt/autoConfigure.cpp    | 21 +++++++++++++++++++++
 8 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/dbcon/mysql/mysql-Columnstore b/dbcon/mysql/mysql-Columnstore
index 5b7e69cd7..9f130d5dc 100755
--- a/dbcon/mysql/mysql-Columnstore
+++ b/dbcon/mysql/mysql-Columnstore
@@ -64,15 +64,8 @@ datadir=$basedir/db
 service_startup_timeout=90
 user=`whoami 2>/dev/null`
 
-# Lock directory for root user
-lockdir='/var/lock/subsys'
-# Lock directory for non-root user
-if $user != "root"
-then
-  lockdir='$HOME/.lock'
-fi
-
-mkdir $lockdir
+# Lock directory
+lockdir=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation LockFileDirectory`
 
 lock_file_path="$lockdir/mysql-Columnstore"
 
diff --git a/oam/etc/Columnstore.xml b/oam/etc/Columnstore.xml
index 70a0add6d..cb91f9348 100644
--- a/oam/etc/Columnstore.xml
+++ b/oam/etc/Columnstore.xml
@@ -469,6 +469,7 @@
 		<MySQLPort>3306</MySQLPort>
 		<AmazonDeviceName>/dev/xvd</AmazonDeviceName>
 		<DistributedInstall>y</DistributedInstall>
+		<LockFileDirectory>/var/lock/subsys</LockFileDirectory>
 	</Installation>
 	<ExtentMap>
 		<!--
diff --git a/oam/etc/Columnstore.xml.singleserver b/oam/etc/Columnstore.xml.singleserver
index 8768eb6ce..2ed98d87f 100644
--- a/oam/etc/Columnstore.xml.singleserver
+++ b/oam/etc/Columnstore.xml.singleserver
@@ -463,6 +463,7 @@
 		<JavaPath>unassigned</JavaPath>
 		<MySQLPort>3306</MySQLPort>
 		<DistributedInstall>y</DistributedInstall>
+		<LockFileDirectory>/var/lock/subsys</LockFileDirectory>
 	</Installation>
 	<ExtentMap>
 		<!--
diff --git a/oam/install_scripts/columnstore b/oam/install_scripts/columnstore
index 5addd4c6a..b1159d815 100644
--- a/oam/install_scripts/columnstore
+++ b/oam/install_scripts/columnstore
@@ -56,17 +56,7 @@ if [ "x$has_um" = x ]; then
 	has_um=0
 fi
 
-user=`whoami 2>/dev/null`
-
-# Lock directory for root user
-lockdir='/var/lock/subsys'
-# Lock directory for non-root user
-if $user != "root"
-then
-  lockdir='$HOME/.lock'
-fi
-
-mkdir $lockdir
+lockdir=`$InstallDir/bin/getConfig Installation LockFileDirectory`
 
 checkInstallSetup() {
 	InitialInstallFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Columnstore.xml Installation InitialInstallFlag`
diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install
index e69689126..f3d46a0ed 100755
--- a/oam/install_scripts/post-install
+++ b/oam/install_scripts/post-install
@@ -242,6 +242,20 @@ else
 	rm -f /var/lock/subsys/mysql-Columnstore
 fi
 
+#determine lock file directory
+# Lock directory for root user
+lockdir='/var/lock/subsys'
+if [ $user != "root" ];then
+  # Lock directory for non-root user
+  lockdir=$prefix/.lock
+fi
+
+$installdir/bin/setConfig -d Installation LockFileDirectory $lockdir
+
+mkdir $lockdir >/dev/null 2>&1
+
+rm -f $lockdir/mysql-Columnstore
+
 #backup copy of Alarm Config File
 /bin/cp -f $installdir/etc/AlarmConfig.xml $installdir/etc/AlarmConfig.xml.installSave > /dev/null 2>&1
 
diff --git a/oam/install_scripts/pre-uninstall b/oam/install_scripts/pre-uninstall
index 29f3915a2..b5e9774a4 100755
--- a/oam/install_scripts/pre-uninstall
+++ b/oam/install_scripts/pre-uninstall
@@ -70,7 +70,6 @@ rm -rf /tmp/bucketreuse
 rm -f /tmp/columnstore.txt
 rm -f /tmp/dbbuilder.*
 rm -f /tmp/dbrmfiles
-rm -f /var/lock/subsys/columnstore
 rm -f /tmp/pkgcheck
 rm -f /tmp/upgrade-status.log.*
 rm -f /tmp/mount.log
@@ -78,6 +77,10 @@ rm -f $installdir/data/bulk/tmpjob/* >/dev/null 2>&1
 rm -rf /tmp/columnstore_tmp_files
 rm -f $installdir/local/moveDbrootTransactionLog
 
+lockdir=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation LockFileDirectory`
+rm -f $lockdir/subsys/columnstore
+rm -f $lockdir/mysql-Columnstore
+
 # delete core files
 #rm -f /var/log/mariadb/columnstore/corefiles/* > /dev/null 2>&1
 
diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index 9453409a9..fa1f6f410 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -10682,8 +10682,18 @@ bool Oam::checkSystemRunning()
     // string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
     // system(cmd.c_str());
     struct stat st;
+
+    string lockFileDir = "/var/subsys/lock";
     
-    string lockFile = userDir + "/columnstore";
+    try
+    {
+            Config* sysConfig = Config::makeConfig(CalpontConfigFile.c_str());
+            lockFileDir = sysConfig->getConfig("Installation", "LockFileDirectory");
+    }
+    catch (...) 
+    {} // defaulted to false
+
+    string lockFile = lockFileDir + "/columnstore";
     
     if (stat(lockFile.c_str(), &st) == 0)
     {
diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp
index 9947b9161..b30536d8d 100644
--- a/tools/configMgt/autoConfigure.cpp
+++ b/tools/configMgt/autoConfigure.cpp
@@ -2091,6 +2091,26 @@ int main(int argc, char* argv[])
     catch (...)
     {}
 
+    try
+    {
+        string LockFileDirectory = sysConfigOld->getConfig("Installation", "LockFileDirectory");
+
+        if ( !LockFileDirectory.empty() )
+        {
+            try
+            {
+                sysConfigNew->setConfig("Installation", "LockFileDirectory", LockFileDirectory);
+            }
+            catch (...)
+            {
+                cout << "ERROR: Problem setting LockFileDirectory in the Calpont System Configuration file" << endl;
+                exit(-1);
+            }
+        }
+    }
+    catch (...)
+    {}
+    
     try
     {
         string DistributedInstall = sysConfigOld->getConfig("Installation", "DistributedInstall");
@@ -2111,6 +2131,7 @@ int main(int argc, char* argv[])
     catch (...)
     {}
 
+
     // add entries from tuning guide
 
     string ColScanReadAheadBlocks;