MCOL-4012 Update

oam/install_scripts/columnstore-post-install.in

@@ -291,10 +291,15 @@ chmod 777 /dev/shm
 
 systemctl cat mariadb-columnstore.service > /dev/null 2>&1
 if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
-    echo "Populating the engine initial system catalog."
-    systemctl start mariadb-columnstore
-    sleep 5
-    dbbuilder 7 > $tmpDir/dbbuilder.log 2>&1
+    # prevent clusters using shared storage from initializing columnstore more than once
+    IFLAG=/var/lib/columnstore/storagemanager/cs-initialized
+    mkdir -p /var/lib/columnstore/storagemanager
+
+    if [ ! -e $IFLAG ]; then
+       touch $IFLAG
+       echo "Populating the engine initial system catalog."
+       systemctl start mariadb-columnstore
+    fi
 fi
  
 if [ $stop_mysqld -eq 1 ];then

oam/install_scripts/mariadb-columnstore-start.sh

@@ -10,6 +10,6 @@
 /bin/systemctl start mcs-dmlproc
 /bin/systemctl start mcs-ddlproc
 
-dbbuilder 7
+su -s /bin/sh -c 'dbbuilder 7' mysql 2> /tmp/columnstore_tmp_files/dbbuilder.log
 
 exit 0

oam/install_scripts/mcs-loadbrm.service.in

@@ -1,7 +1,7 @@
 [Unit]
 Description=loadbrm
 PartOf=mcs-workernode.service
-After=mcs-storagemanager.service
+After=network.target mcs-storagemanager.service
 
 [Service]
 Type=oneshot

oam/install_scripts/mcs-workernode.service.in

@@ -10,7 +10,6 @@ Group=mysql
 LimitNOFILE=65536
 LimitNPROC=65536
 
-ExecStartPre=@ENGINE_BINDIR@/mcs-loadbrm.py
 ExecStart=@ENGINE_BINDIR@/workernode DBRM_Worker1 fg
 ExecStopPost=@ENGINE_BINDIR@/mcs-savebrm.py
 ExecStopPost=/usr/bin/env bash -c "clearShm > /dev/null 2>&1"