Merge pull request #1230 from jmrojas2332/MCOL-4025

MCOL-4025 systemd units now preload libjemalloc

CMakeLists.txt

@@ -392,9 +392,9 @@ IF (INSTALL_LAYOUT)
             set(SUSE_VERSION_NUMBER "${CMAKE_MATCH_1}")
         ENDIF ()
         if (${SUSE_VERSION_NUMBER} EQUAL 12)
-            SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "expect" "boost-devel >= 1.54.0" "snappy" "jemalloc" "net-tools" PARENT_SCOPE)
+            SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "expect" "boost-devel >= 1.54.0" "snappy" "jemalloc" "net-tools MariaDB-server" PARENT_SCOPE)
         else ()
-            SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "snappy" "jemalloc" "net-tools" PARENT_SCOPE)
+            SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "snappy" "jemalloc" "net-tools MariaDB-server" PARENT_SCOPE)
         endif()
 
         SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/build/preInstall_storage_engine.sh PARENT_SCOPE)

cmake/cpackEngineRPM.cmake

@@ -77,13 +77,13 @@ IF (EXISTS "/etc/SuSE-release")
     set(SUSE_VERSION_NUMBER "${CMAKE_MATCH_1}")
 ENDIF ()
 if (${REDHAT_VERSION_NUMBER} EQUAL 6)
-    SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "MariaDB-columnstore-shared" "snappy" "net-tools")
+    SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "MariaDB-columnstore-shared" "snappy" "net-tools" "MariaDB-server")
     # Disable auto require as this will also try to pull Boost via RPM
     SET(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
 elseif (${SUSE_VERSION_NUMBER} EQUAL 12)
-    SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "boost-devel >= 1.54.0" "libsnappy1" "jemalloc" "net-tools")
+    SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "boost-devel >= 1.54.0" "libsnappy1" "jemalloc" "net-tools" "MariaDB-server")
 else ()
-    SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "boost >= 1.53.0" "snappy" "jemalloc" "net-tools")
+    SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "boost >= 1.53.0" "snappy" "jemalloc" "net-tools" "MariaDB-server")
 endif()
 
 SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preInstall_storage_engine.sh)

oam/install_scripts/columnstore-post-install.in

@@ -177,13 +177,17 @@ if [ -z "aws" ]; then
 fi
 
 postConfigure
-systemctl start mariadb-columnstore
 
-# Wait for all columnstore to be ready, DDLProc is final process in startup order
+systemctl cat mariadb-columnstore.service > /dev/null 2>&1
-while  [ -z  "$(pgrep -x DDLProc)" ];
+if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
-do
+    systemctl start mariadb-columnstore
-    sleep 1
+     
-done
+    # Wait for all columnstore to be ready, DDLProc is final process in startup order
+    while  [ -z  "$(pgrep -x DDLProc)" ];
+    do
+        sleep 1
+    done
+fi
  
 dbbuilder 7 > $tmpDir/dbbuilder.log
 

oam/install_scripts/mcs-controllernode.service.in

@@ -5,7 +5,7 @@ After=mcs-workernode.service
 
 [Service]
 Type=forking
-Environment="SKIP_OAM_INIT=1"
+ExecStartPre=/usr/bin/env bash -c "systemctl start mcs-workernode"
 ExecStart=@ENGINE_BINDIR@/controllernode
 Restart=on-failure
 ExecStop=@ENGINE_BINDIR@/mcs-stop-controllernode.sh $MAINPID

oam/install_scripts/mcs-ddlproc.service.in

@@ -1,11 +1,10 @@
 [Unit]
 Description=mcs-ddlproc
-PartOf=mcs-exemgr.service
+PartOf=mcs-writeengineserver.service
 After=mcs-dmlproc.service
 
 [Service]
 Type=simple
-Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/DDLProc
 Restart=on-failure
 TimeoutStopSec=2

oam/install_scripts/mcs-dmlproc.service.in

@@ -1,11 +1,10 @@
 [Unit]
 Description=mcs-dmlproc
-PartOf=mcs-exemgr.service
+PartOf=mcs-writeengineserver.service
-After=mcs-exemgr.service
+After=mcs-writeengineserver.service
 
 [Service]
 Type=simple
-Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/DMLProc
 Restart=on-failure
 TimeoutStopSec=2

oam/install_scripts/mcs-exemgr.service.in

@@ -1,12 +1,11 @@
 [Unit]
 Description=mcs-exemgr
-PartOf=mcs-writeengineserver.service
+PartOf=mcs-primproc.service
-After=mcs-writeengineserver.service
+After=mcs-primproc.service
 
 [Service]
 Type=simple
-Environment="SKIP_OAM_INIT=1"
+ExecStart=/usr/bin/env bash -c "LD_PRELOAD=$(ldconfig -p | grep -m1 libjemalloc | awk '{print $1}') exec @ENGINE_BINDIR@/ExeMgr"
-ExecStart=@ENGINE_BINDIR@/ExeMgr
 Restart=on-failure
 TimeoutStopSec=2
 

oam/install_scripts/mcs-loadbrm.service.in

@@ -6,7 +6,6 @@ ConditionPathExists=/var/lib/columnstore/data1/systemFiles/dbrm/BRM_saves_curren
 
 [Service]
 Type=simple
-Environment="SKIP_OAM_INIT=1"
 ExecStart=/usr/bin/env bash -c "/usr/bin/load_brm /var/lib/columnstore/data1/systemFiles/dbrm/$(cat /var/lib/columnstore/data1/systemFiles/dbrm/BRM_saves_current)"
 
 [Install]

oam/install_scripts/mcs-primproc.service.in

@@ -6,8 +6,8 @@ After=mcs-controllernode.service
 
 [Service]
 Type=simple
-Environment="SKIP_OAM_INIT=1"
+ExecStart=/usr/bin/env bash -c "LD_PRELOAD=$(ldconfig -p | grep -m1 libjemalloc | awk '{print $1}') exec @ENGINE_BINDIR@/PrimProc"
-ExecStart=@ENGINE_BINDIR@/PrimProc
+ExecStartPost=sleep 2
 Restart=on-failure
 TimeoutStopSec=2
 

oam/install_scripts/mcs-workernode.service.in

@@ -5,7 +5,6 @@ After=mcs-loadbrm.service
 
 [Service]
 Type=forking
-Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/workernode DBRM_Worker1
 Restart=on-failure
 ExecStop=-@ENGINE_BINDIR@/save_brm

oam/install_scripts/mcs-writeengineserver.service.in

@@ -1,12 +1,11 @@
 [Unit]
 Description=WriteEngineServer
-PartOf=mcs-primproc.service
+PartOf=mcs-exemgr.service
-After=mcs-primproc.service
+After=mcs-exemgr.service
 
 [Service]
 Type=simple
-Environment="SKIP_OAM_INIT=1"
+ExecStart=/usr/bin/env bash -c "LD_PRELOAD=$(ldconfig -p | grep -m1 libjemalloc | awk '{print $1}') exec @ENGINE_BINDIR@/WriteEngineServer"
-ExecStart=@ENGINE_BINDIR@/WriteEngineServer
 Restart=on-failure
 TimeoutStopSec=2
 

oam/install_scripts/post-mysql-install

@@ -22,10 +22,7 @@ checkForError() {
         # See if engine columnstore exist
         #---------------------------------------------------------------------------
         echo "checking for engine columnstore..."
-        mysql \
+        su -s /bin/sh -c 'mysql --execute="show engines"' mysql 2> ${tmpdir}/post-mysql-install.log | grep -i columnstore
-                --user=root \
-                --execute='show engines;' \
-                | grep -i columnstore
 
         #
         # Add compressiontype column to SYSCOLUMN if applicable