Merge pull request #1221 from jmrojas2332/develop

MCOL-3915 Update columnstore install and uninstall procedure

cmake/cpackEngineRPM.cmake

@@ -86,7 +86,7 @@ else ()
     SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "boost >= 1.53.0" "snappy" "jemalloc" "net-tools")
 endif()
 
-SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preInstall_storeage_engine.sh)
+SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preInstall_storage_engine.sh)
 SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_storage_engine.sh)
 SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preUn_storage_engine.sh)
 

dbcon/mysql/install_mcs_mysql.sh.in

@@ -17,7 +17,7 @@ for arg in "$@"; do
 done
 
 # DELETE libcalmysql.so entries first as they are in ha_columnstore.so in 1.4.2 onwards
-mysql --force --user=root mysql 2> ${tmpdir}/mysql_install.log <<EOD
+su -s /bin/sh -c 'mysql'  mysql 2> ${tmpdir}/mysql_install.log <<EOD
 DELETE FROM mysql.func WHERE dl='libcalmysql.so';
 INSERT INTO mysql.func VALUES ('calgetstats',0,'ha_columnstore.so','function');
 INSERT INTO mysql.func VALUES ('calsettrace',2,'ha_columnstore.so','function');
@@ -110,9 +110,10 @@ CREATE TABLE IF NOT EXISTS infinidb_querystats.priority
 insert ignore into infinidb_querystats.priority values ('High', 100),('Medium', 66), ('Low', 33);
 EOD
 
-mysql --user=root  mysql 2>/dev/null <@ENGINE_SUPPORTDIR@/syscatalog_mysql.sql
+su -s /bin/sh -c 'mysql <@ENGINE_SUPPORTDIR@/syscatalog_mysql.sql' mysql 2>/dev/null
-mysql --user=root  mysql 2>/dev/null <@ENGINE_SUPPORTDIR@/calsetuserpriority.sql
+su -s /bin/sh -c 'mysql <@ENGINE_SUPPORTDIR@/calsetuserpriority.sql' mysql 2>/dev/null
-mysql --user=root  mysql 2>/dev/null <@ENGINE_SUPPORTDIR@/calremoveuserpriority.sql
+su -s /bin/sh -c 'mysql <@ENGINE_SUPPORTDIR@/calremoveuserpriority.sql' mysql 2>/dev/null
-mysql --user=root  mysql 2>/dev/null <@ENGINE_SUPPORTDIR@/calshowprocesslist.sql
+su -s /bin/sh -c 'mysql <@ENGINE_SUPPORTDIR@/calshowprocesslist.sql' mysql 2>/dev/null
-mysql --user=root  mysql 2>/dev/null <@ENGINE_SUPPORTDIR@/columnstore_info.sql
+su -s /bin/sh -c 'mysql <@ENGINE_SUPPORTDIR@/columnstore_info.sql' mysql 2>/dev/null
+
 

oam/install_scripts/columnstore-post-install.in

@@ -4,11 +4,33 @@
 #
 # Post-install steps for columnstore install
 
+running_systemd() {
+   if  [ "$(ps --no-headers -o comm 1)" == "systemd" ]; then
+       echo 0
+   else
+       echo 1
+   fi
+}
+
 rpmmode=install
 user=`whoami 2>/dev/null`
 
 quiet=0
 
+stop_mysqld=0
+if [ -z "$(pgrep -x mysqld)" ];then
+
+    # Startup mysqld 
+    systemctl cat mariadb.service > /dev/null 2>&1
+    if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
+        systemctl start mariadb.service
+    else
+        /usr/bin/mysqld_safe &
+    fi
+    stop_mysqld=1
+fi
+sleep 2
+
 if [ -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave ]; then
     /bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.new
     /bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf
@@ -157,11 +179,23 @@ fi
 postConfigure
 systemctl start mariadb-columnstore
 
-while  [ -z  $(pgrep -x controllernode) ];
+# Wait for all columnstore to be ready, DDLProc is final process in startup order
+while  [ -z  "$(pgrep -x DDLProc)" ];
 do
-    sleep 2
+    sleep 1
 done
  
 dbbuilder 7 > $tmpDir/dbbuilder.log
-exit 0
 
+if [ $stop_mysqld -eq 1 ];then
+    # Make sure we stop mariadb since it wasn't running prior to columnstore installation
+    systemctl cat mariadb.service > /dev/null 2>&1
+    if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
+        systemctl stop mariadb.service > /dev/null 2>&1
+    else
+        pkill mysqld
+    fi
+
+fi
+sleep 2
+exit 0

oam/install_scripts/columnstore-pre-uninstall.in

@@ -10,7 +10,6 @@ running_systemd() {
     else
         echo 1
     fi
-
 }
 
 # Test we are using systemd
@@ -22,29 +21,32 @@ else
     kill $(pidof $PROGS) > /dev/null
     sleep 3
     kill -9 $(pidof $PROGS) > /dev/null
+    clearShm  > /dev/null 2>&1
+fi
+
+if [ -n "$(pgrep -x ProcMon)" ] || [ -n "$(pgrep -x ProcMgr)" ];then
+   # Old system must be running, kill ProcMon/ProcMgr 
+    pkill ProcMon
+    pkill ProcMgr
 fi
 
 rm -f /etc/profile.d/columnstoreAlias.sh
-
 rm -f /var/log/mariadb/columnstore/activeAlarms > /dev/null 2>&1
 rm -f /var/log/mariadb/columnstore/*.log1 > /dev/null 2>&1
 
-# delete Mariab Columnstore shared memory segments
-clearShm  > /dev/null 2>&1
-
 #get temp directory
 tmpDir=`mcsGetConfig SystemConfig SystemTempFileDir`
 if [[ $tmpDir = *"tmp" ]]; then
 	# delete tmp files
 	rm -rf $tmpDir/*
 fi
+
 rm -f /var/lib/columnstore/local/*.columnstore
 rm -rf /var/lib/columnstore/local/etc/
 rm -f /var/lib/columnstore/data/bulk/tmp/job/* >/dev/null 2>&1
 rm -f /var/lib/columnstore/local/moveDbrootTransactionLog
 rm -rf /var/log/mariadb/columnstore/
 rm -rf /tmp/columnstore_tmp_files
-rm -rf /usr/share/columnstore
 
 lockdir=`mcsGetConfig Installation LockFileDirectory`
 rm -f $lockdir/columnstore
@@ -107,7 +109,6 @@ fi
 /bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml.rpmsave > /dev/null 2>&1
 /bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave > /dev/null 2>&1
 /bin/cp -f @MARIADB_MYCNFDIR@/columnstore.cnf @MARIADB_MYCNFDIR@/columnstore.cnf.rpmsave > /dev/null 2>&1
-cp @ENGINE_SUPPORTDIR@/myCnf-include-args.text @ENGINE_SUPPORTDIR@/myCnf-include-args.text.rpmsave >& /dev/null
 rm -f @ENGINE_SYSCONFDIR@/columnstore/AlarmConfig.xml.installSave
 
 #remove OAMdbrootCheck file

oam/install_scripts/mcs-stop-controllernode.sh.in

@@ -4,12 +4,12 @@
 systemctl stop mcs-workernode --ignore-dependencies
 timeout=$(mcsGetConfig SystemConfig DBRMTimeout)
 
-while [ -n $(pgrep -x controllernode) ] && [ $timeout -gt 0 ]
+while [ -n "$(pgrep -x controllernode)" ] && [ $timeout -gt 0 ]
 do
     sleep 1
     ((--timeout))
 done
 
-if [ -n $(pgrep -x controllernode) ]; then
+if [ -n "$(pgrep -x controllernode)" ]; then
     /bin/kill -9 "$1"
 fi

oam/install_scripts/post-mysql-install

@@ -5,13 +5,6 @@
 # Post-install steps for calpont-mysql install
 
 # check if running systemd
-running_systemd() {
-   if  [ "$(ps --no-headers -o comm 1)" == "systemd" ]; then
-       echo 0
-   else
-       echo 1
-   fi
-}
 
 # check log for error
 checkForError() {
@@ -63,20 +56,6 @@ done
 # Install various Calpont stuff...
 install_mcs_mysql.sh  --tmpdir=$tmpdir
 
-# Restart MariDB, otherwise engine does not show up.
-# Test we are using systemd
-systemctl cat mariadb.service > /dev/null 2>&1
-if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
-    systemctl restart mariadb.service > /dev/null 2>&1
-else
-    pkill mysqld
-    sleep 2
-    export MYSQL_OPTS="--skip-grant-tables"
-    /usr/bin/mysqld_safe --skip-grant-tables &
-    unset MYSQL_OPTS
-fi
-sleep 5
-
 checkForError
 if [ $? -ne 0 ]; then
     echo "ERROR: Invalid password in .my.cnf, or Columnstore plugin install missing"

oamapps/postConfigure/helpers.cpp

@@ -250,12 +250,10 @@ void mysqlSetup()
 {
     Oam oam;
     string cmd;
-
     string tmpDir = startup::StartUp::tmpDir();
-
     string mysqlpw = oam.getMySQLPassword();
-
     string passwordOption = "";
+    
     if ( mysqlpw != oam::UnassignedName )
         passwordOption = " --password=" + mysqlpw;
 

oamapps/postConfigure/postConfigure.cpp

@@ -89,13 +89,8 @@ int main(int argc, char* argv[])
     string cmd;
     string numBlocksPctParam = "";
     string totalUmMemoryParam = "";
-    string reuseConfig = "n";
-    string mysqlPort = "";
     string homeDir = "/root";
     bool rootUser = true;
-    Config* sysConfig = Config::makeConfig();
-
-    mysqlPort = sysConfig->getConfig("Installation", "MySQLPort");
 
     //check if root-user
     int user;
@@ -122,15 +117,11 @@ int main(int argc, char* argv[])
 	char timestamp[200];
 	strftime (timestamp, 200, "%m:%d:%y-%H:%M:%S", &tm);
 	string currentDate = timestamp;
-
 	string postConfigureLog = "/var/log/columnstore-postconfigure-" + currentDate;
 
 	// perform single server install
 	cout << endl << "Performing the Single Server Install." << endl << endl;
 
-	//setup to Columnstore.xml file for single server
-    //singleServerConfigSetup(sysConfig);
-
 	if (!rootUser)
     {
 		if (!updateBash(homeDir))
@@ -147,7 +138,7 @@ int main(int argc, char* argv[])
         totalUmMemoryParam = "-";
     }
 
-	cmd = "columnstore_installer dummy.rpm dummy.rpm dummy.rpm dummy.rpm dummy.rpm initial dummy " + reuseConfig + " --nodeps ' ' 1 " + numBlocksPctParam + " " + totalUmMemoryParam;
+	cmd = "columnstore_installer dummy.rpm dummy.rpm dummy.rpm dummy.rpm dummy.rpm initial dummy n --nodeps ' ' 1 " + numBlocksPctParam + " " + totalUmMemoryParam;
 	system(cmd.c_str());
 	exit(0);
 }