From 19a303f44e748cd6b988ad3089f68d6310d6bf87 Mon Sep 17 00:00:00 2001
From: Jose Rojas <jrojas@mariadb.com>
Date: Tue, 1 Sep 2020 17:51:36 +0000
Subject: [PATCH] MCOL-4012 Add back mcs-loadbrm.py.in and mcs-loadbrm.service

---
 .gitignore                                                | 1 +
 oam/install_scripts/CMakeLists.txt                        | 3 +++
 oam/install_scripts/columnstore-post-install.in           | 3 +++
 oam/install_scripts/{mcs-loadbrm.py => mcs-loadbrm.py.in} | 0
 oam/install_scripts/mcs-workernode.service.in             | 2 +-
 5 files changed, 8 insertions(+), 1 deletion(-)
 rename oam/install_scripts/{mcs-loadbrm.py => mcs-loadbrm.py.in} (100%)

diff --git a/.gitignore b/.gitignore
index 859f19852..4bf2821ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,6 +145,7 @@ oam/install_scripts/mcs-primproc.service
 oam/install_scripts/mcs-stop-controllernode.sh
 oam/install_scripts/mcs-workernode.service
 oam/install_scripts/mcs-writeengineserver.service
+oam/install_scripts/mcs-loadbrm.py
 oam/install_scripts/mcs-storagemanager.service
 oam/install_scripts/mcs_module_installer.sh
 oam/install_scripts/slave-rep-columnstore.sh
diff --git a/oam/install_scripts/CMakeLists.txt b/oam/install_scripts/CMakeLists.txt
index f68913aa9..be58ae25d 100644
--- a/oam/install_scripts/CMakeLists.txt
+++ b/oam/install_scripts/CMakeLists.txt
@@ -19,8 +19,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-exemgr.service.in" "${CMAKE_CURR
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-writeengineserver.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-writeengineserver.service" @ONLY)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-dmlproc.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-dmlproc.service" @ONLY)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-ddlproc.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-ddlproc.service" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-loadbrm.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-loadbrm.service" @ONLY)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-storagemanager.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-storagemanager.service" @ONLY)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-stop-controllernode.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-stop-controllernode.sh" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-loadbrm.py.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-loadbrm.py" @ONLY)
 
 install(PROGRAMS columnstore-post-install 
                 columnstore-pre-uninstall 
@@ -65,6 +67,7 @@ install(FILES mariadb-columnstore.service
               mcs-writeengineserver.service
               mcs-dmlproc.service
               mcs-ddlproc.service
+              mcs-loadbrm.service
               mcs-storagemanager.service
               DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-engine)
 
diff --git a/oam/install_scripts/columnstore-post-install.in b/oam/install_scripts/columnstore-post-install.in
index 0b84c5d82..b084e5116 100755
--- a/oam/install_scripts/columnstore-post-install.in
+++ b/oam/install_scripts/columnstore-post-install.in
@@ -153,6 +153,8 @@ if [ $user = "root" ]; then
         cp @ENGINE_SUPPORTDIR@/mcs-workernode.service /lib/systemd/system/. >/dev/null 2>&1
         cp @ENGINE_SUPPORTDIR@/mcs-writeengineserver.service /usr/lib/systemd/system/. >/dev/null 2>&1
         cp @ENGINE_SUPPORTDIR@/mcs-writeengineserver.service /lib/systemd/system/. >/dev/null 2>&1
+        cp @ENGINE_SUPPORTDIR@/mcs-loadbrm.service /usr/lib/systemd/system/. >/dev/null 2>&1
+        cp @ENGINE_SUPPORTDIR@/mcs-loadbrm.service /lib/systemd/system/. >/dev/null 2>&1
         cp @ENGINE_SUPPORTDIR@/mcs-storagemanager.service /usr/lib/systemd/system/. >/dev/null 2>&1
         cp @ENGINE_SUPPORTDIR@/mcs-storagemanager.service /lib/systemd/system/. >/dev/null 2>&1
 
@@ -165,6 +167,7 @@ if [ $user = "root" ]; then
         systemctl enable mcs-primproc > /dev/null 2>&1
         systemctl enable mcs-workernode > /dev/null 2>&1
         systemctl enable mcs-writeengineserver > /dev/null 2>&1
+        systemctl enable mcs-loadbrm > /dev/null 2>&1
         systemctl enable mcs-storagemanager > /dev/null 2>&1
     else
         chkconfig=`which chkconfig 2>/dev/null`
diff --git a/oam/install_scripts/mcs-loadbrm.py b/oam/install_scripts/mcs-loadbrm.py.in
similarity index 100%
rename from oam/install_scripts/mcs-loadbrm.py
rename to oam/install_scripts/mcs-loadbrm.py.in
diff --git a/oam/install_scripts/mcs-workernode.service.in b/oam/install_scripts/mcs-workernode.service.in
index 8bf981662..5ce479720 100644
--- a/oam/install_scripts/mcs-workernode.service.in
+++ b/oam/install_scripts/mcs-workernode.service.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=mcs-workernode
-After=network.target
+After=network.target mcs-loadbrm.service
 
 [Service]
 Type=simple