From ce64ad7bac4942a59ae0946e8336eda71ae6a0bd Mon Sep 17 00:00:00 2001
From: Jose Rojas <jrojas@mariadb.com>
Date: Tue, 1 Sep 2020 17:16:32 +0000
Subject: [PATCH] MCOL-4012 Update

---
 oam/install_scripts/columnstore-post-install.in  | 13 +++++++++----
 oam/install_scripts/mariadb-columnstore-start.sh |  2 +-
 oam/install_scripts/mcs-loadbrm.service.in       |  2 +-
 oam/install_scripts/mcs-workernode.service.in    |  1 -
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/oam/install_scripts/columnstore-post-install.in b/oam/install_scripts/columnstore-post-install.in
index 08bf36576..0b84c5d82 100755
--- a/oam/install_scripts/columnstore-post-install.in
+++ b/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
diff --git a/oam/install_scripts/mariadb-columnstore-start.sh b/oam/install_scripts/mariadb-columnstore-start.sh
index aa9be86de..79d094ba3 100644
--- a/oam/install_scripts/mariadb-columnstore-start.sh
+++ b/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
diff --git a/oam/install_scripts/mcs-loadbrm.service.in b/oam/install_scripts/mcs-loadbrm.service.in
index 62aad4a6f..6df22b81a 100644
--- a/oam/install_scripts/mcs-loadbrm.service.in
+++ b/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
diff --git a/oam/install_scripts/mcs-workernode.service.in b/oam/install_scripts/mcs-workernode.service.in
index 04f95e590..8bf981662 100644
--- a/oam/install_scripts/mcs-workernode.service.in
+++ b/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"