MCOL-3914 Updates to systemd units

oam/install_scripts/controllernode.service.in

@@ -4,8 +4,11 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
+Type=forking
+Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/controllernode
 Restart=on-failure
+ExecStop=/bin/kill -9 $MAINPID
 
 [Install]
 WantedBy=columnstore.service

oam/install_scripts/ddlproc.service.in

@@ -4,9 +4,11 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
+Type=simple
+Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/DDLProc
 Restart=on-failure
-
+ExecStop=/usr/bin/bash -c "/bin/kill -9 $(pidof DDLProc)"
 
 [Install]
 WantedBy=columnstore.service

oam/install_scripts/dmlproc.service.in

@@ -4,8 +4,11 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
+Type=simple
+Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/DMLProc
 Restart=on-failure
+ExecStop=/usr/bin/bash -c "/bin/kill -9 $(pidof DMLProc)"
 
 [Install]
 WantedBy=columnstore.service

oam/install_scripts/exemgr.service.in

@@ -4,8 +4,11 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
+Type=simple
+Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/ExeMgr
 Restart=on-failure
+ExecStop=/usr/bin/bash -c "/bin/kill -9 $(pidof ExeMgr)"
 
 [Install]
 WantedBy=columnstore.service

oam/install_scripts/primproc.service.in

@@ -4,8 +4,11 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
+Type=simple
+Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/PrimProc
 Restart=on-failure
+ExecStop=/usr/bin/bash -c "/bin/kill -9 $(pidof PrimProc)"
 
 [Install]
 WantedBy=columnstore.service

oam/install_scripts/workernode.service.in

@@ -4,9 +4,12 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
+Type=forking
 ExecStartPre=@ENGINE_BINDIR@/bash -c "clearShm > /dev/null 2>&1"
+ExecStartPre=/usr/bin/bash -c "/usr/bin/load_brm /var/lib/columnstore/data1/systemFiles/dbrm/$(cat /var/lib/columnstore/data1/systemFiles/dbrm/BRM_saves_current)"
 ExecStart=@ENGINE_BINDIR@/workernode DBRM_Worker1
 Restart=on-failure
+ExecStop=/bin/save_brm ; /usr/bin/bash -c "/bin/kill -9 $MAINPID"
 
 [Install]
 WantedBy=columnstore.service

oam/install_scripts/writeengine.service.in

@@ -4,8 +4,11 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
-ExecStart=/usr/bin/WriteEngineServer
+Type=simple
+Environment="SKIP_OAM_INIT=1"
+ExecStart=@ENGINE_BINDIR@/WriteEngineServer
 Restart=on-failure
+ExecStop=/usr/bin/bash -c "/bin/kill -9 $(pidof WriteEngineServer)"
 
 [Install]
 WantedBy=columnstore.service