MCOL-3915 Columnstore-post-install/postConfigure processed and columnstore started during installation

oam/install_scripts/columnstore-post-install.in

@@ -55,10 +55,9 @@ rm -f /var/lib/columnstore/data/bulk/tmpjob/* >/dev/null 2>&1
 #get temp base directory
 tmpDir="/tmp"
 #get columnstore temp file directory name
-TempFileDir=`mcsGetConfig SystemConfig TempFileDir`
-tmpDir=${tmpDir}${TempFileDir}
+tmpDir=/tmp/columnstore_tmp_files
 mkdir $tmpDir >/dev/null 2>&1
-chmod 777 $tmpDir
+chmod 664 $tmpDir
 
 #create mount directories
 mkdir /mnt/tmp > /dev/null 2>&1
@@ -85,8 +84,8 @@ if [ $user = "root" ]; then
 	systemctl=`which systemctl 2>/dev/null`
 	if [ -n "$systemctl" ]; then
 
-        cp @ENGINE_SUPPORTDIR@/controllernode.service /usr/lib/systemd/system/. >/dev/null 2>&1
-		cp @ENGINE_SUPPORTDIR@/controllernode.service /lib/systemd/system/. >/dev/null 2>&1
+        cp @ENGINE_SUPPORTDIR@/columnstore.service /usr/lib/systemd/system/. >/dev/null 2>&1
+		cp @ENGINE_SUPPORTDIR@/columnstore.service /lib/systemd/system/. >/dev/null 2>&1
         cp @ENGINE_SUPPORTDIR@/controllernode.service /usr/lib/systemd/system/. >/dev/null 2>&1
 		cp @ENGINE_SUPPORTDIR@/controllernode.service /lib/systemd/system/. >/dev/null 2>&1
         cp @ENGINE_SUPPORTDIR@/ddlproc.service /usr/lib/systemd/system/. >/dev/null 2>&1
@@ -97,12 +96,20 @@ if [ $user = "root" ]; then
 		cp @ENGINE_SUPPORTDIR@/exemgr.service /lib/systemd/system/. >/dev/null 2>&1
         cp @ENGINE_SUPPORTDIR@/primproc.service /usr/lib/systemd/system/. >/dev/null 2>&1
 		cp @ENGINE_SUPPORTDIR@/primproc.service /lib/systemd/system/. >/dev/null 2>&1
-        cp @ENGINE_SUPPORTDIR@/workdernode.service /usr/lib/systemd/system/. >/dev/null 2>&1
+        cp @ENGINE_SUPPORTDIR@/workernode.service /usr/lib/systemd/system/. >/dev/null 2>&1
 		cp @ENGINE_SUPPORTDIR@/workernode.service /lib/systemd/system/. >/dev/null 2>&1
         cp @ENGINE_SUPPORTDIR@/writeengine.service /usr/lib/systemd/system/. >/dev/null 2>&1
 		cp @ENGINE_SUPPORTDIR@/writeengine.service /lib/systemd/system/. >/dev/null 2>&1
 
 		systemctl enable columnstore >/dev/null 2>&1
+        systemctl enable controllernode > /dev/null 2>&1
+        systemctl enable ddlproc > /dev/null 2>&1
+        systemctl enable dmlproc > /dev/null 2>&1
+        systemctl enable exemgr > /dev/null 2>&1
+        systemctl enable primproc > /dev/null 2>&1
+        systemctl enable workernode > /dev/null 2>&1
+        systemctl enable writeengine > /dev/null 2>&1
+
 	else
 		chkconfig=`which chkconfig 2>/dev/null`
 		if [ -n "$chkconfig" ]; then
@@ -164,29 +171,7 @@ if [ -z "aws" ]; then
 	MCSgetCredentials.sh >/dev/null 2>&1
 fi
 
-cat <<EOD
-The next step on the node that will become PM1:
-
 postConfigure
-
-
-EOD
-
-#postConfigure scripts
-#post-mysqld-install --tmpDir=$tmpDir > $tmpDir/post-mysqld-install.log 2>&1
-#post-mysql-install --tmpDir=$tmpDir > $tmpDir/post-mysql-install.log 2>&1
-#columnstore restart > /dev/null 2>&1
-#dbbuilder 7 > $tmpDir/dbbuilder.log 2>&1
-
-postConfigure -qs
-
-PROGS='workernode controllernode PrimProc ExeMgr DMLProc DDLProc mysqld WriteEngineServer'
-MCS_INSTALL_DIR=/usr
-
-kill $(pidof $PROGS) > /dev/null
-sleep 3
-kill -9 $(pidof $PROGS) > /dev/null
-@ENGINE_BINDIR@/clearShm
 systemctl start columnstore
 
 exit 0

oam/install_scripts/columnstore.service.in

@@ -3,10 +3,14 @@ Description=MariaDB Columnstore
 
 [Service]
 Type=oneshot
-ExecStart=@ENGINE_BINDIR@/columnstore-post-install
+
+# Execute a dummy program
+ExecStart=/bin/true
 
 # This service shall be considered active after start
 RemainAfterExit=yes
+Restart=on-abort
+RestartSec=5s
 
 [Install]
 WantedBy=multi-user.target

oam/install_scripts/controllernode.service.in

@@ -4,10 +4,8 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
-Type=forking
-GuessMainPID=yes
-ExecStartPre=@ENGINE_BINDIR@/bash -c "touch /var/log/mariadb/columnstore/controllernode.log && chmod 666 /var/log/mariadb/columnstore/controllernode.log"
 ExecStart=@ENGINE_BINDIR@/controllernode &> /var/log/mariadb/columnstore/controllernode.log
+Restart=on-failure
 
 [Install]
 WantedBy=columnstore.service

oam/install_scripts/ddlproc.service.in

@@ -4,10 +4,9 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
-Type=forking
-GuessMainPID=yes
-ExecStartPre=@ENGINE_BINDIR@/bash -c "touch /var/log/mariadb/columnstore/ddlproc.log && chmod 666 /var/log/mariadb/columnstore/ddlproc.log"
 ExecStart=@ENGINE_BINDIR@/DDLProc &> /var/log/mariadb/columnstore/ddlproc.log
+Restart=on-failure
+
 
 [Install]
 WantedBy=columnstore.service

oam/install_scripts/dmlproc.service.in

@@ -4,10 +4,8 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
-Type=forking
-GuessMainPID=yes
-ExecStartPre=@ENGINE_BINDIR@/bash -c "touch /var/log/mariadb/columnstore/dmlproc.log && chmod 666 /var/log/mariadb/columnstore/dmlproc.log"
 ExecStart=@ENGINE_BINDIR@/DMLProc &> /var/log/mariadb/columnstore/dmlproc.log
+Restart=on-failure
 
 [Install]
 WantedBy=columnstore.service

oam/install_scripts/exemgr.service.in

@@ -4,10 +4,7 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
-Type=forking
-GuessMainPID=yes
-ExecStartPre=@ENGINE_BINDIR@/bash -c "touch /var/log/mariadb/columnstore/exemgr.log && chmod 666 /var/log/mariadb/columnstore/exemgr.log"
-ExecStart=@ENGINE_BINDIR@/ExeMgr &> /var/log/mariadb/columnstore/exemgr.log
+ExecStart=@ENGINE_BINDIR@/ExeMgr
 Restart=on-failure
 
 [Install]

oam/install_scripts/primproc.service.in

@@ -4,10 +4,8 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
-Type=forking
-GuessMainPID=yes
-ExecStartPre=@ENGINE_BINDIR@/bash -c "touch /var/log/mariadb/columnstore/primproc.log && chmod 666 /var/log/mariadb/columnstore/primproc.log"
 ExecStart=@ENGINE_BINDIR@/PrimProc &> /var/log/mariadb/columnstore/primproc.log
+Restart=on-failure
 
 [Install]
 WantedBy=columnstore.service

oam/install_scripts/workernode.service.in

@@ -4,11 +4,9 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
-Type=forking
-GuessMainPID=yes
-ExecStartPre=@ENGINE_BINDIR@/bash -c "touch /var/log/mariadb/columnstore/workernode.log && chmod 666 /var/log/mariadb/columnstore/workernode.log"
 ExecStartPre=@ENGINE_BINDIR@/bash -c "clearShm > /dev/null 2>&1"
 ExecStart=@ENGINE_BINDIR@/workernode DBRM_Worker1 &> /var/log/mariadb/columnstore/workernode.log
+Restart=on-failure
 
 [Install]
 WantedBy=columnstore.service

oam/install_scripts/writeengine.service.in

@@ -4,10 +4,8 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
-Type=forking
-GuessMainPID=yes
-ExecStartPre=/usr/bin/bash -c "touch /var/log/mariadb/columnstore/writeengineserver.log && chmod 666 /var/log/mariadb/columnstore/writeengineserver.log"
 ExecStart=/usr/bin/WriteEngineServer &> /var/log/mariadb/columnstore/writeengineserver.log
+Restart=on-failure
 
 [Install]
 WantedBy=columnstore.service