From 1c463fa32905f27d91c3bb31e3eec7e8eba8ba1b Mon Sep 17 00:00:00 2001 From: Roman Nozdrin Date: Tue, 9 Jun 2020 15:47:17 +0000 Subject: [PATCH] MCOL-4019 This patch avoids fork() in wokernode/controllernode that hangs in ThreadPool::~ waiting infinitely for fPruneThread->join() to return. --- oam/install_scripts/mcs-controllernode.service.in | 5 ++--- oam/install_scripts/mcs-workernode.service.in | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/oam/install_scripts/mcs-controllernode.service.in b/oam/install_scripts/mcs-controllernode.service.in index 6a8e40c5b..34b23b0ca 100644 --- a/oam/install_scripts/mcs-controllernode.service.in +++ b/oam/install_scripts/mcs-controllernode.service.in @@ -4,8 +4,7 @@ PartOf=mcs-workernode.service After=mcs-workernode.service [Service] -Type=forking -ExecStartPre=/usr/bin/env bash -c "systemctl start mcs-workernode" -ExecStart=@ENGINE_BINDIR@/controllernode +Type=simple +ExecStart=@ENGINE_BINDIR@/controllernode fg Restart=on-failure ExecStop=@ENGINE_BINDIR@/mcs-stop-controllernode.sh $MAINPID diff --git a/oam/install_scripts/mcs-workernode.service.in b/oam/install_scripts/mcs-workernode.service.in index ec6340429..780827cf0 100644 --- a/oam/install_scripts/mcs-workernode.service.in +++ b/oam/install_scripts/mcs-workernode.service.in @@ -3,8 +3,8 @@ Description=mcs-workernode After=mcs-loadbrm.service [Service] -Type=forking -ExecStart=@ENGINE_BINDIR@/workernode DBRM_Worker1 +Type=simple +ExecStart=@ENGINE_BINDIR@/workernode DBRM_Worker1 fg Restart=on-failure ExecStop=/usr/bin/env bash -c "kill -15 $MAINPID" ExecStopPost=-@ENGINE_BINDIR@/save_brm